dev-lang/perl: fix fix for #645804 during bootstrap

Closes: https://bugs.gentoo.org/670836
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

diff --git a/dev-lang/perl/perl-5.26.2.ebuild b/dev-lang/perl/perl-5.26.2.ebuild
index 602748dc4a26196b15136fa052a4b1f9733366c0..83fb285a19861ef1049f34ab72df434b1c744816 100644 (file)
--- a/dev-lang/perl/perl-5.26.2.ebuild
+++ b/dev-lang/perl/perl-5.26.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -331,7 +331,7 @@ src_prepare() {
        fi
 
        # Use errno.h from prefix rather than from host system, bug #645804
-       if use prefix && ! use prefix-guest; then
+       if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then
                sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
        fi
 

diff --git a/dev-lang/perl/perl-5.26.9999.ebuild b/dev-lang/perl/perl-5.26.9999.ebuild
index 602748dc4a26196b15136fa052a4b1f9733366c0..83fb285a19861ef1049f34ab72df434b1c744816 100644 (file)
--- a/dev-lang/perl/perl-5.26.9999.ebuild
+++ b/dev-lang/perl/perl-5.26.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -331,7 +331,7 @@ src_prepare() {
        fi
 
        # Use errno.h from prefix rather than from host system, bug #645804
-       if use prefix && ! use prefix-guest; then
+       if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then
                sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
        fi
 

diff --git a/dev-lang/perl/perl-5.28.0.ebuild b/dev-lang/perl/perl-5.28.0.ebuild
index 3fee6ac8677a3c1d4bd210dc8df88e564313fc02..c990d1af72b5f6f9a2e2295483f5eccc98b3ed88 100644 (file)
--- a/dev-lang/perl/perl-5.28.0.ebuild
+++ b/dev-lang/perl/perl-5.28.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -331,7 +331,7 @@ src_prepare() {
        fi
 
        # Use errno.h from prefix rather than from host system, bug #645804
-       if use prefix && ! use prefix-guest; then
+       if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then
                sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
        fi
 

diff --git a/dev-lang/perl/perl-5.28.9999.ebuild b/dev-lang/perl/perl-5.28.9999.ebuild
index 3fee6ac8677a3c1d4bd210dc8df88e564313fc02..c990d1af72b5f6f9a2e2295483f5eccc98b3ed88 100644 (file)
--- a/dev-lang/perl/perl-5.28.9999.ebuild
+++ b/dev-lang/perl/perl-5.28.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -331,7 +331,7 @@ src_prepare() {
        fi
 
        # Use errno.h from prefix rather than from host system, bug #645804
-       if use prefix && ! use prefix-guest; then
+       if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then
                sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
        fi