From eef74ff29879ac29d794c1f6052f75695377e362 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 6 May 2013 19:55:06 +0200 Subject: [PATCH] Remove packages Zlib[-devel] from ReleaseBuildProfiles Instead add Zlib as a mandatory package and Zlib-devel as a Development dependency. --- build/jam/OptionalPackageDependencies | 7 ++----- build/jam/ReleaseBuildProfiles | 2 -- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies index 0b8aadd978..e050ed05ad 100644 --- a/build/jam/OptionalPackageDependencies +++ b/build/jam/OptionalPackageDependencies @@ -1,8 +1,5 @@ # package dependencies -# -# For transitive dependencies dependents should be listed before their -# dependencies. OptionalPackageDependencies APR-util : APR Expat ; OptionalPackageDependencies AllegroLibs : XiphLibs ; @@ -14,7 +11,7 @@ OptionalPackageDependencies Caya : Expat ; OptionalPackageDependencies CDRecord : GetText LibIconv ; OptionalPackageDependencies Curl : OpenSSL ; OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ; -OptionalPackageDependencies Development : DevelopmentBase Perl ; +OptionalPackageDependencies Development : DevelopmentBase Perl Zlib-devel ; OptionalPackageDependencies DevelopmentPowerPC : DevelopmentMin ; OptionalPackageDependencies GetText : LibIconv ; OptionalPackageDependencies Git : Expat Curl OpenSSL LibIconv ; @@ -47,4 +44,4 @@ OptionalPackageDependencies XZ-Utils : Tar ; OptionalPackageDependencies Zlib-devel : Zlib ; OptionalPackageDependencies MandatoryPackages - : Bzip Ctags Grep ICU LibSolv Sed Tar ; + : Bzip Ctags Grep ICU LibSolv Sed Tar Zlib ; diff --git a/build/jam/ReleaseBuildProfiles b/build/jam/ReleaseBuildProfiles index 923c9dd1c6..295056aee0 100644 --- a/build/jam/ReleaseBuildProfiles +++ b/build/jam/ReleaseBuildProfiles @@ -27,7 +27,6 @@ switch $(HAIKU_BUILD_PROFILE) { AddOptionalHaikuImagePackages KeymapSwitcher Nano P7zip Welcome BeBook XZ-Utils ; AddOptionalHaikuImagePackages wpa_supplicant Man ; - AddOptionalHaikuImagePackages Zlib Zlib-devel ; } case "beta-*" : { @@ -46,7 +45,6 @@ switch $(HAIKU_BUILD_PROFILE) { AddOptionalHaikuImagePackages Pe Nano Vision P7zip XZ-Utils ; AddOptionalHaikuImagePackages Development Git OpenSSH OpenSSL ; AddOptionalHaikuImagePackages wpa_supplicant WebPositive Man ; - AddOptionalHaikuImagePackages Zlib Zlib-devel ; } }