[haiku-commits] Re: r35830 - in haiku/trunk: . build/jam
- From: Matt Madia <mattmadia@xxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 12 Mar 2010 14:43:34 -0500
On Fri, Mar 12, 2010 at 13:56, Ingo Weinhold <ingo_weinhold@xxxxxx> wrote:
> On 2010-03-12 at 19:07:19 [+0100], mattmadia@xxxxxxxxx wrote:
>> 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.
>>
> Admittedly that's all not particularly nice. A better solution would be to
> adjust AddOptionalHaikuImagePackages and OptionalPackageDependencies to work
> in arbitrary order. For that to work the list of (immediate) dependencies for
> each package would need to be tracked and AddOptionalHaikuImagePackages would
> need to work recursively.
In the short term, could this be applied while I figure out the better solution?
(and yes, i tested `jam -q -sHAIKU_BUILD_FEATURE_SSL=1` this time)
Index: Jamfile
===================================================================
--- Jamfile (revision 35830)
+++ Jamfile (working copy)
@@ -160,16 +160,16 @@
#include packages that are required by all images.
AddOptionalHaikuImagePackages MandatoryPackages ;
+# Evaluate optional package dependencies and prepare the optional build
+# features before parsing the Jamfile tree.
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalPackageDependencies ] ;
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalBuildFeatures ] ;
+
# 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 ] ;
-include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalBuildFeatures ] ;
-
# Optionally we allow not to include the "src" subdirectory.
if $(HAIKU_DONT_INCLUDE_SRC) {
# Don't include "src", but at least include the stuff needed for the
-=--=-=-=-=-
Other related posts:
