From 429618d249dd14ab73931a7b2a876d2adc56cd64 Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Fri, 12 Mar 2010 18:07:19 +0000 Subject: [PATCH] Moves the conditional adding of OpenSSL from HaikuImage to the root Jamfile. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35830 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- Jamfile | 7 ++++++- build/jam/HaikuImage | 5 ----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Jamfile b/Jamfile index a19f49f7f1..2c4b5197cb 100644 --- a/Jamfile +++ b/Jamfile @@ -158,7 +158,12 @@ if $(HAIKU_ADD_OPTIONAL_PACKAGES) { } #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. diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 47b722f801..d369354ac9 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -27,11 +27,6 @@ if $(HAIKU_ATA_STACK) = 1 { 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