From b2d0f2e7b6631b82a18bec9feeb7f1ce14271814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Wed, 1 Oct 2014 22:34:45 +0200 Subject: [PATCH] Use bash_bootstrap for the bootstrap build. * 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. --- Jamfile | 6 +----- build/jam/images/definitions/bootstrap | 4 ---- build/jam/repositories/HaikuPortsCross/arm | 2 ++ build/jam/repositories/HaikuPortsCross/ppc | 2 ++ build/jam/repositories/HaikuPortsCross/x86 | 2 ++ build/jam/repositories/HaikuPortsCross/x86_64 | 2 ++ build/jam/repositories/HaikuPortsCross/x86_gcc2 | 2 ++ src/data/package_infos/arm/haiku | 5 ----- src/data/package_infos/m68k/haiku | 5 ----- src/data/package_infos/ppc/haiku | 5 ----- src/data/package_infos/x86/haiku | 5 ----- src/data/package_infos/x86_64/haiku | 5 ----- src/data/package_infos/x86_gcc2/haiku | 5 ----- 13 files changed, 11 insertions(+), 39 deletions(-) diff --git a/Jamfile b/Jamfile index bfcc3887bf..c11bd179cd 100644 --- a/Jamfile +++ b/Jamfile @@ -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 }@ diff --git a/build/jam/images/definitions/bootstrap b/build/jam/images/definitions/bootstrap index 256ec1caf2..78986c78e2 100644 --- a/build/jam/images/definitions/bootstrap +++ b/build/jam/images/definitions/bootstrap @@ -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 ] diff --git a/build/jam/repositories/HaikuPortsCross/arm b/build/jam/repositories/HaikuPortsCross/arm index e3af09a042..8aa5369a9c 100644 --- a/build/jam/repositories/HaikuPortsCross/arm +++ b/build/jam/repositories/HaikuPortsCross/arm @@ -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 diff --git a/build/jam/repositories/HaikuPortsCross/ppc b/build/jam/repositories/HaikuPortsCross/ppc index 16ed387c18..fbb45d6f48 100644 --- a/build/jam/repositories/HaikuPortsCross/ppc +++ b/build/jam/repositories/HaikuPortsCross/ppc @@ -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 diff --git a/build/jam/repositories/HaikuPortsCross/x86 b/build/jam/repositories/HaikuPortsCross/x86 index ab1ab207b4..103701f31a 100644 --- a/build/jam/repositories/HaikuPortsCross/x86 +++ b/build/jam/repositories/HaikuPortsCross/x86 @@ -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 diff --git a/build/jam/repositories/HaikuPortsCross/x86_64 b/build/jam/repositories/HaikuPortsCross/x86_64 index 2daf1eaf20..9e3c6efdc3 100644 --- a/build/jam/repositories/HaikuPortsCross/x86_64 +++ b/build/jam/repositories/HaikuPortsCross/x86_64 @@ -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 diff --git a/build/jam/repositories/HaikuPortsCross/x86_gcc2 b/build/jam/repositories/HaikuPortsCross/x86_gcc2 index 8a623f36d5..44245580df 100644 --- a/build/jam/repositories/HaikuPortsCross/x86_gcc2 +++ b/build/jam/repositories/HaikuPortsCross/x86_gcc2 @@ -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 diff --git a/src/data/package_infos/arm/haiku b/src/data/package_infos/arm/haiku index 858d387a10..dca74581b9 100644 --- a/src/data/package_infos/arm/haiku +++ b/src/data/package_infos/arm/haiku @@ -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 diff --git a/src/data/package_infos/m68k/haiku b/src/data/package_infos/m68k/haiku index f8b79f4904..8014176ad6 100644 --- a/src/data/package_infos/m68k/haiku +++ b/src/data/package_infos/m68k/haiku @@ -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 diff --git a/src/data/package_infos/ppc/haiku b/src/data/package_infos/ppc/haiku index 24f911bf31..745f316d31 100644 --- a/src/data/package_infos/ppc/haiku +++ b/src/data/package_infos/ppc/haiku @@ -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 diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku index 1c88e64e63..41ee92f50a 100644 --- a/src/data/package_infos/x86/haiku +++ b/src/data/package_infos/x86/haiku @@ -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 diff --git a/src/data/package_infos/x86_64/haiku b/src/data/package_infos/x86_64/haiku index d507a3b0ed..713574186a 100644 --- a/src/data/package_infos/x86_64/haiku +++ b/src/data/package_infos/x86_64/haiku @@ -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 diff --git a/src/data/package_infos/x86_gcc2/haiku b/src/data/package_infos/x86_gcc2/haiku index 97653174d7..ebe88fb094 100644 --- a/src/data/package_infos/x86_gcc2/haiku +++ b/src/data/package_infos/x86_gcc2/haiku @@ -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