bash: use outsourced package for non-bootstrap builds.

* the bootstrap build keeps on building the in-tree bash.
haiku · Oct 1, 2014 · 8b21b2b · 8b21b2b
1 parent 9577c31
commit 8b21b2b
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 4 deletions.
diff --git a/Jamfile b/Jamfile
@@ -25,10 +25,14 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 AddHaikuImagePackages [ FFilterByBuildFeatures
 	curl freetype icu libsolv zlib
 
+	minimum_image @{
+		bash
+	}@
+
 	regular_image @{
-		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
+		bash 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
 	}@
 ] ;
 if $(HAIKU_PACKAGING_ARCHS[1]) != x86_gcc2 {

diff --git a/build/jam/images/definitions/bootstrap b/build/jam/images/definitions/bootstrap
@@ -3,6 +3,10 @@
 # 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 ]

diff --git a/build/jam/images/definitions/minimum b/build/jam/images/definitions/minimum
@@ -3,7 +3,7 @@
 SYSTEM_BIN = [ FFilterByBuildFeatures
 	"["
 	addattr alert arp
-	base64 basename bash bc beep bfsinfo
+	base64 basename bc beep bfsinfo
 	cal cat catattr checkfs checkitout chgrp chmod chop chown chroot cksum clear
 	clockconfig cmp collectcatkeys comm compress copyattr cp csplit cut
 	date dc dd desklink df diff diff3 dircolors dirname diskimage draggers

diff --git a/src/data/package_infos/arm/haiku b/src/data/package_infos/arm/haiku
@@ -23,7 +23,9 @@ provides {
 	cmd:arp
 	cmd:base64
 	cmd:basename
+#ifdef HAIKU_BOOTSTRAP_BUILD
 	cmd:bash
+#endif
 	cmd:bc
 	cmd:cat
 	cmd:chgrp

diff --git a/src/data/package_infos/m68k/haiku b/src/data/package_infos/m68k/haiku
@@ -23,7 +23,9 @@ provides {
 	cmd:arp
 	cmd:base64
 	cmd:basename
+#ifdef HAIKU_BOOTSTRAP_BUILD
 	cmd:bash
+#endif
 	cmd:bc
 	cmd:cat
 	cmd:chgrp

diff --git a/src/data/package_infos/ppc/haiku b/src/data/package_infos/ppc/haiku
@@ -23,7 +23,9 @@ provides {
 	cmd:arp
 	cmd:base64
 	cmd:basename
+#ifdef HAIKU_BOOTSTRAP_BUILD
 	cmd:bash
+#endif
 	cmd:bc
 	cmd:cat
 	cmd:chgrp

diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku
@@ -23,7 +23,9 @@ provides {
 	cmd:arp
 	cmd:base64
 	cmd:basename
+#ifdef HAIKU_BOOTSTRAP_BUILD
 	cmd:bash
+#endif
 	cmd:bc
 	cmd:cat
 	cmd:chgrp

diff --git a/src/data/package_infos/x86_64/haiku b/src/data/package_infos/x86_64/haiku
@@ -22,7 +22,9 @@ provides {
 	cmd:arp
 	cmd:base64
 	cmd:basename
+#ifdef HAIKU_BOOTSTRAP_BUILD
 	cmd:bash
+#endif
 	cmd:bc
 	cmd:cat
 	cmd:chgrp

diff --git a/src/data/package_infos/x86_gcc2/haiku b/src/data/package_infos/x86_gcc2/haiku
@@ -23,7 +23,9 @@ provides {
 	cmd:arp
 	cmd:base64
 	cmd:basename
+#ifdef HAIKU_BOOTSTRAP_BUILD
 	cmd:bash
+#endif
 	cmd:bc
 	cmd:cat
 	cmd:chgrp