[haiku-commits] r35830 - in haiku/trunk: . build/jam

  • From: mattmadia@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 12 Mar 2010 19:07:19 +0100 (CET)

Author: mmadia
Date: 2010-03-12 19:07:19 +0100 (Fri, 12 Mar 2010)
New Revision: 35830
Changeset: http://dev.haiku-os.org/changeset/35830/haiku

Modified:
   haiku/trunk/Jamfile
   haiku/trunk/build/jam/HaikuImage
Log:
Moves the conditional adding of OpenSSL from HaikuImage to the root Jamfile.


Modified: haiku/trunk/Jamfile
===================================================================
--- haiku/trunk/Jamfile 2010-03-12 18:03:57 UTC (rev 35829)
+++ haiku/trunk/Jamfile 2010-03-12 18:07:19 UTC (rev 35830)
@@ -158,8 +158,13 @@
 }
 
 #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
 # features before parsing the Jamfile tree.
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalPackageDependencies ] ;

Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage    2010-03-12 18:03:57 UTC (rev 35829)
+++ haiku/trunk/build/jam/HaikuImage    2010-03-12 18:07:19 UTC (rev 35830)
@@ -27,11 +27,6 @@
        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
        cal cat catattr checkfs checkitout chgrp chmod chop chown chroot cksum 
clear
        clockconfig cmp collectcatkeys comm compress copyattr CortexAddOnHost cp


Other related posts: