diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2018-12-13 08:50:25 +0100 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2018-12-13 08:50:25 +0100 |
| commit | e477fc65969ca0841cb8bca657bc364a2e5ba965 (patch) | |
| tree | d12adccd691d3f64edfd740dd631e7ecb2a11dd7 | |
| parent | scripts/bootstrap-prefix: fix bootstrap on Solaris (diff) | |
| download | prefix-e477fc65969ca0841cb8bca657bc364a2e5ba965.tar.gz prefix-e477fc65969ca0841cb8bca657bc364a2e5ba965.tar.bz2 prefix-e477fc65969ca0841cb8bca657bc364a2e5ba965.zip | |
scripts/bootstrap-prefix: apply masks before emerging
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
| -rwxr-xr-x | scripts/bootstrap-prefix.sh | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 9335fb6661..9e08be65f6 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1543,16 +1543,14 @@ bootstrap_stage2() { sys-devel/binutils-config ) - emerge_pkgs --nodeps "${pkgs[@]}" || return 1 - - # Debian multiarch supported by RAP needs ld to support sysroot. - EXTRA_ECONF=$(rapx --with-sysroot=/) \ - emerge_pkgs --nodeps ${linker} || return 1 - # Old versions of gcc has been masked. We need gcc-4.7 to bootstrap # on systems without a c++ compiler. echo '<sys-devel/gcc-4.8' >> "${ROOT}"/tmp/etc/portage/package.unmask - + + # libffi-3.0_rc0 has broken Solaris ld support, which we still + # use at this stage (host compiler) + [[ ${CHOST} == *-solaris* ]] && echo "=dev-libs/libffi-3.3_rc0" \ + >> "${ROOT}"/tmp/etc/portage/package.mask # kill some dependencies here while we're still fragile { @@ -1567,11 +1565,14 @@ bootstrap_stage2() { echo "sys-apps/help2man -nls" # avoid hefty set of deps from glib echo "dev-util/pkgconfig internal-glib" - # libffi-3.0_rc0 has broken Solaris ld support, which we still - # use at this stage (host compiler) - [[ ${CHOST} == *-solaris* ]] && echo "=dev-libs/libffi-3.3_rc0" } >> "${ROOT}"/tmp/etc/portage/package.use + emerge_pkgs --nodeps "${pkgs[@]}" || return 1 + + # Debian multiarch supported by RAP needs ld to support sysroot. + EXTRA_ECONF=$(rapx --with-sysroot=/) \ + emerge_pkgs --nodeps ${linker} || return 1 + for pkg in ${compiler_stage1} ; do # <glibc-2.5 does not understand .gnu.hash, use # --hash-style=both to produce also sysv hash. |