Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/
Date: Mon, 11 Jun 2018 16:39:04
Message-Id: 1528735067.ddf86254b773b1a2205c8ef166c7d8c7fdcfa697.grobian@gentoo
1 commit: ddf86254b773b1a2205c8ef166c7d8c7fdcfa697
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 11 16:37:47 2018 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 11 16:37:47 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ddf86254
7
8 scripts/bootstrap-prefix: (try to) workaround libtool stage3 issue
9
10 Closes: https://bugs.gentoo.org/655414
11
12 scripts/bootstrap-prefix.sh | 11 +++++++++++
13 1 file changed, 11 insertions(+)
14
15 diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
16 index 910483897c..c9debd1bd3 100755
17 --- a/scripts/bootstrap-prefix.sh
18 +++ b/scripts/bootstrap-prefix.sh
19 @@ -1541,6 +1541,17 @@ bootstrap_stage2() {
20 EXTRA_ECONF=$(rapx --with-sysroot=/) \
21 emerge_pkgs --nodeps ${linker} || return 1
22
23 + # automake and autoconf need to be installed in /tmp in order for
24 + # autotools.eclass to run successfully, bug #655414, #657414
25 + # rely on Perl from host, let's hope it's there
26 + unset PERL
27 + if [[ -x $(type -P perl) ]] ; then
28 + ( cd "${ROOT}"/tmp/usr/bin && ln -s $(type -P perl) )
29 + emerge_pkgs --nodeps sys-devel/autoconf sys-devel/automake || return 1
30 + else
31 + einfo "You don't have perl available, you'll likely run into bug #657414"
32 + fi
33 +
34 # Old versions of gcc has been masked. We need gcc-4.7 to bootstrap
35 # on systems without a c++ compiler.
36 echo '<sys-devel/gcc-4.8' >> "${ROOT}"/tmp/etc/portage/package.unmask