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
This commit is contained in:
Augustin Cavalier
2020-04-19 18:10:40 -04:00
parent 26044ec39c
commit 55e10d7ca4
+8 -8
View File
@@ -65,20 +65,20 @@ if [ IsOptionalHaikuImagePackageAdded BeOSCompatibility ] {
# Development # Development
if [ IsOptionalHaikuImagePackageAdded Development ] { if [ IsOptionalHaikuImagePackageAdded Development ] {
# autotools and perl # autotools
AddHaikuImageDisabledPackages autoconf automake perl texinfo ; AddHaikuImageDisabledPackages autoconf automake texinfo ;
AddHaikuImageSourcePackages autoconf automake texinfo ; AddHaikuImageSourcePackages autoconf automake texinfo ;
# some other build tools # some other build tools
AddHaikuImageDisabledPackages pkgconfig scons ; AddHaikuImageDisabledPackages pkgconfig ;
AddHaikuImageSourcePackages pkgconfig ; AddHaikuImageSourcePackages pkgconfig ;
# devel packages for some of the base set # devel packages for some of the base set
local architectureObject ; local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] { for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) { on $(architectureObject) {
AddHaikuImageDisabledPackages curl_devel glu_devel jpeg_devel AddHaikuImageDisabledPackages curl_devel openssl_devel nghttp2_devel
libpng16_devel zlib_devel ; libjpeg_turbo_devel libpng16_devel zlib_devel ;
} }
} }
} }
@@ -90,8 +90,8 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ] {
local architectureObject ; local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] { for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) { on $(architectureObject) {
AddHaikuImageDisabledPackages binutils gcc ; AddHaikuImageDisabledPackages binutils gcc mpc gmp mpfr ;
AddHaikuImageSourcePackages binutils gcc ; AddHaikuImageSourcePackages binutils gcc mpc gmp mpfr ;
} }
} }
@@ -125,7 +125,7 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ]
# Git # Git
if [ IsOptionalHaikuImagePackageAdded Git ] { if [ IsOptionalHaikuImagePackageAdded Git ] {
AddHaikuImageSystemPackages git git_daemon ; AddHaikuImageSystemPackages git git_daemon perl ;
AddHaikuImageSourcePackages git ; AddHaikuImageSourcePackages git ;
} }