i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moves the conditional adding of OpenSSL from HaikuImage to the root Jamfile.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35830 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia
2010-03-12 18:07:19 +00:00
parent a5c31cbbc0
commit 429618d249
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jamfile
+5
View File
@@ -160,6 +160,11 @@ if $(HAIKU_ADD_OPTIONAL_PACKAGES) {
#include packages that are required by all images. #include packages that are required by all images.
AddOptionalHaikuImagePackages MandatoryPackages ; AddOptionalHaikuImagePackages MandatoryPackages ;
# If enabled, make sure that OpenSSL is added to the image.
if $(HAIKU_OPENSSL_ENABLED) {
AddOptionalHaikuImagePackages OpenSSL ;
}
# Evaluate optional package dependencies and prepare the optional build # Evaluate optional package dependencies and prepare the optional build
# features before parsing the Jamfile tree. # features before parsing the Jamfile tree.
include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalPackageDependencies ] ; include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalPackageDependencies ] ;
build/jam/HaikuImage
-5
View File
@@ -27,11 +27,6 @@ if $(HAIKU_ATA_STACK) = 1 {
IDE_ONLY = "" ; IDE_ONLY = "" ;
} }
# Make sure that OpenSSL is added to the image.
if $(HAIKU_OPENSSL_ENABLED) {
AddOptionalHaikuImagePackages OpenSSL ;
}
SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bootman bzip2 SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bootman bzip2
cal cat catattr checkfs checkitout chgrp chmod chop chown chroot cksum clear cal cat catattr checkfs checkitout chgrp chmod chop chown chroot cksum clear
clockconfig cmp collectcatkeys comm compress copyattr CortexAddOnHost cp clockconfig cmp collectcatkeys comm compress copyattr CortexAddOnHost cp