From 55e10d7ca4a8ebf21ea8f12278420350822aa81b Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sun, 19 Apr 2020 18:01:59 -0400 Subject: [PATCH] OptionalPackages: Rework following build-packages changes. * perl must go in /system/packages as git requires it * mpc, gmp, mpfr needed by gcc * jpeg was replaced by libjpeg_turbo * glu not necessary --- build/jam/OptionalPackages | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 2022cc5a97..aad873ea43 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -65,20 +65,20 @@ if [ IsOptionalHaikuImagePackageAdded BeOSCompatibility ] { # Development if [ IsOptionalHaikuImagePackageAdded Development ] { - # autotools and perl - AddHaikuImageDisabledPackages autoconf automake perl texinfo ; + # autotools + AddHaikuImageDisabledPackages autoconf automake texinfo ; AddHaikuImageSourcePackages autoconf automake texinfo ; # some other build tools - AddHaikuImageDisabledPackages pkgconfig scons ; + AddHaikuImageDisabledPackages pkgconfig ; AddHaikuImageSourcePackages pkgconfig ; # devel packages for some of the base set local architectureObject ; for architectureObject in [ MultiArchSubDirSetup ] { on $(architectureObject) { - AddHaikuImageDisabledPackages curl_devel glu_devel jpeg_devel - libpng16_devel zlib_devel ; + AddHaikuImageDisabledPackages curl_devel openssl_devel nghttp2_devel + libjpeg_turbo_devel libpng16_devel zlib_devel ; } } } @@ -90,8 +90,8 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ] { local architectureObject ; for architectureObject in [ MultiArchSubDirSetup ] { on $(architectureObject) { - AddHaikuImageDisabledPackages binutils gcc ; - AddHaikuImageSourcePackages binutils gcc ; + AddHaikuImageDisabledPackages binutils gcc mpc gmp mpfr ; + AddHaikuImageSourcePackages binutils gcc mpc gmp mpfr ; } } @@ -125,7 +125,7 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] # Git if [ IsOptionalHaikuImagePackageAdded Git ] { - AddHaikuImageSystemPackages git git_daemon ; + AddHaikuImageSystemPackages git git_daemon perl ; AddHaikuImageSourcePackages git ; }