Haiku/haiku
Haiku/haiku
1
0
Fork 0
mirror of https://review.haiku-os.org/haiku synced 2025-01-18 12:38:51 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use bash_bootstrap for the bootstrap build.

Browse Source 
* don't build the in-tree bash.
* bash doesn't need to be a mandatory package, it's now a dependency of
the haiku package.
This commit is contained in:
Jérôme Duval 2014-10-01 22:34:45 +02:00
parent 689e777570
commit b2d0f2e7b6
13 changed files with 11 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Jamfile
View File

@ -25,12 +25,8 @@ for architectureObject in [ MultiArchSubDirSetup ] {
AddHaikuImagePackages [ FFilterByBuildFeatures
curl freetype icu libsolv zlib
minimum_image @{
bash
}@
regular_image @{
bash bzip2 ctags ffmpeg findutils gawk glu grep gutenprint jasper jpeg
bzip2 ctags ffmpeg findutils gawk glu grep gutenprint jasper jpeg
less libicns libpng libwebp mesa mesa_devel mesa_swrast sed sharutils
tar tiff wget which
}@

4
build/jam/images/definitions/bootstrap
View File

@ -3,10 +3,6 @@
# import everything from the minimum image
include [ FDirName $(HAIKU_BUILD_RULES_DIR) images definitions minimum ] ;
SYSTEM_BIN += [ FFilterByBuildFeatures
bash
] ;
# build and add the source package directory and a haikuports.config file
CopyDirectoryToHaikuImage home haikuports
: [ BuildHaikuPortsSourcePackageDirectory ]

2
build/jam/repositories/HaikuPortsCross/arm
View File

@ -13,6 +13,7 @@ BootstrapPackageRepository HaikuPortsCross
autoconf_bootstrap-2.69-2
automake_bootstrap-1.13.1-1
libtool_cross_generic-2.4
bash_bootstrap-4.3.27-1
binutils_bootstrap-2.24_2014_03_19-1
bison_bootstrap-2.4.3-1
curl_bootstrap-7.26.0-1
@ -45,6 +46,7 @@ BootstrapPackageRepository HaikuPortsCross
# source packages
autoconf_bootstrap
automake_bootstrap
bash_bootstrap
binutils_bootstrap
bison_bootstrap
curl_bootstrap

2
build/jam/repositories/HaikuPortsCross/ppc
View File

@ -12,6 +12,7 @@ BootstrapPackageRepository HaikuPortsCross
# repository architecture packages (stage 1)
autoconf_bootstrap-2.69-2
automake_bootstrap-1.13.1-1
bash_bootstrap-4.3.27-1
binutils_bootstrap-2.24_2014_03_19-1
bison_bootstrap-2.4.3-1
flex_bootstrap-2.5.35-1
@ -40,6 +41,7 @@ BootstrapPackageRepository HaikuPortsCross
# source packages
autoconf_bootstrap
automake_bootstrap
bash_bootstrap
binutils_bootstrap
bison_bootstrap
flex_bootstrap

2
build/jam/repositories/HaikuPortsCross/x86
View File

@ -17,6 +17,7 @@ BootstrapPackageRepository HaikuPortsCross
# repository architecture packages (stage 1)
autoconf_bootstrap-2.69-2
automake_bootstrap-1.13.1-1
bash_bootstrap-4.3.27-1
binutils_bootstrap-2.24_2014_03_19-1
bison_bootstrap-2.4.3-1
findutils_bootstrap-4.4.2-1
@ -63,6 +64,7 @@ BootstrapPackageRepository HaikuPortsCross
# source packages
autoconf_bootstrap
automake_bootstrap
bash_bootstrap
binutils_bootstrap
bison_bootstrap
findutils_bootstrap

2
build/jam/repositories/HaikuPortsCross/x86_64
View File

@ -12,6 +12,7 @@ BootstrapPackageRepository HaikuPortsCross
# repository architecture packages (stage 1)
autoconf_bootstrap-2.69-2
automake_bootstrap-1.13.1-1
bash_bootstrap-4.3.27-1
binutils_bootstrap-2.24_2014_03_19-1
bison_bootstrap-2.4.3-1
curl_bootstrap-7.26.0-1
@ -44,6 +45,7 @@ BootstrapPackageRepository HaikuPortsCross
# source packages
autoconf_bootstrap
automake_bootstrap
bash_bootstrap
binutils_bootstrap
bison_bootstrap
curl_bootstrap

2
build/jam/repositories/HaikuPortsCross/x86_gcc2
View File

@ -17,6 +17,7 @@ BootstrapPackageRepository HaikuPortsCross
# repository architecture packages (stage 1)
autoconf_bootstrap-2.69-2
automake_bootstrap-1.13.1-1
bash_bootstrap-4.3.27-1
binutils_bootstrap-2.17_2013_04_21-3
bison_bootstrap-2.4.3-1
findutils_bootstrap-4.4.2-1
@ -63,6 +64,7 @@ BootstrapPackageRepository HaikuPortsCross
# source packages
autoconf_bootstrap
automake_bootstrap
bash_bootstrap
binutils_bootstrap
bison_bootstrap
findutils_bootstrap

5
src/data/package_infos/arm/haiku
View File

@ -23,9 +23,6 @@ provides {
cmd:arp
cmd:base64
cmd:basename
#ifdef HAIKU_BOOTSTRAP_BUILD
cmd:bash
#endif
cmd:bc
cmd:cat
cmd:chgrp
@ -172,9 +169,7 @@ provides {
}
requires {
#ifndef HAIKU_BOOTSTRAP_BUILD
cmd:bash
#endif
lib:libfreetype
lib:libgcc_s
lib:libicudata

5
src/data/package_infos/m68k/haiku
View File

@ -23,9 +23,6 @@ provides {
cmd:arp
cmd:base64
cmd:basename
#ifdef HAIKU_BOOTSTRAP_BUILD
cmd:bash
#endif
cmd:bc
cmd:cat
cmd:chgrp
@ -172,9 +169,7 @@ provides {
}
requires {
#ifndef HAIKU_BOOTSTRAP_BUILD
cmd:bash
#endif
lib:libfreetype
lib:libgcc_s
#ifdef HAIKU_REGULAR_BUILD

5
src/data/package_infos/ppc/haiku
View File

@ -23,9 +23,6 @@ provides {
cmd:arp
cmd:base64
cmd:basename
#ifdef HAIKU_BOOTSTRAP_BUILD
cmd:bash
#endif
cmd:bc
cmd:cat
cmd:chgrp
@ -172,9 +169,7 @@ provides {
}
requires {
#ifndef HAIKU_BOOTSTRAP_BUILD
cmd:bash
#endif
lib:libfreetype
lib:libgcc_s
lib:libicudata

5
src/data/package_infos/x86/haiku
View File

@ -23,9 +23,6 @@ provides {
cmd:arp
cmd:base64
cmd:basename
#ifdef HAIKU_BOOTSTRAP_BUILD
cmd:bash
#endif
cmd:bc
cmd:cat
cmd:chgrp
@ -172,9 +169,7 @@ provides {
}
requires {
#ifndef HAIKU_BOOTSTRAP_BUILD
cmd:bash
#endif
lib:libcurl
lib:libfreetype
lib:libgcc_s

5
src/data/package_infos/x86_64/haiku
View File

@ -22,9 +22,6 @@ provides {
cmd:arp
cmd:base64
cmd:basename
#ifdef HAIKU_BOOTSTRAP_BUILD
cmd:bash
#endif
cmd:bc
cmd:cat
cmd:chgrp
@ -171,9 +168,7 @@ provides {
}
requires {
#ifndef HAIKU_BOOTSTRAP_BUILD
cmd:bash
#endif
lib:libcurl
lib:libgcc_s
lib:libfreetype

5
src/data/package_infos/x86_gcc2/haiku
View File

@ -23,9 +23,6 @@ provides {
cmd:arp
cmd:base64
cmd:basename
#ifdef HAIKU_BOOTSTRAP_BUILD
cmd:bash
#endif
cmd:bc
cmd:cat
cmd:chgrp
@ -173,9 +170,7 @@ provides {
}
requires {
#ifndef HAIKU_BOOTSTRAP_BUILD
cmd:bash
#endif
lib:libcurl
lib:libfreetype
lib:libicudata