commit: 3d7eca7b2d1b470efae85b72f9452970a6732f1d
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 12 14:04:59 2018 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Wed Jun 13 01:31:02 2018 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3d7eca7b
As discussed in Bug 655414, no perl from the host should be assumed.
Revert "scripts/bootstrap-prefix: (try to) workaround libtool stage3 issue"
This reverts commit ddf86254b773b1a2205c8ef166c7d8c7fdcfa697.
scripts/bootstrap-prefix.sh | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 8483a62149..7d6a552970 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1547,17 +1547,6 @@ bootstrap_stage2() {
EXTRA_ECONF=$(rapx --with-sysroot=/) \
emerge_pkgs --nodeps ${linker} || return 1
- # automake and autoconf need to be installed in /tmp in order for
- # autotools.eclass to run successfully, bug #655414, #657414
- # rely on Perl from host, let's hope it's there
- unset PERL
- if [[ -x $(type -P perl) ]] ; then
- ( cd "${ROOT}"/tmp/usr/bin && ln -s $(type -P perl) )
- emerge_pkgs --nodeps sys-devel/autoconf sys-devel/automake ||
return 1
- else
- einfo "You don't have perl available, you'll likely run into
bug #657414"
- fi
-
# 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
