commit:     2e39a7b89df99dce85a08af276ec31429b2be786
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  6 10:49:05 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec  6 10:49:05 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e39a7b8

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

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

 dev-lang/perl/perl-5.26.2.ebuild    | 4 ++--
 dev-lang/perl/perl-5.26.9999.ebuild | 4 ++--
 dev-lang/perl/perl-5.28.0.ebuild    | 4 ++--
 dev-lang/perl/perl-5.28.9999.ebuild | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dev-lang/perl/perl-5.26.2.ebuild b/dev-lang/perl/perl-5.26.2.ebuild
index 602748dc4a2..83fb285a198 100644
--- 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 602748dc4a2..83fb285a198 100644
--- 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 3fee6ac8677..c990d1af72b 100644
--- 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 3fee6ac8677..c990d1af72b 100644
--- 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
 

Reply via email to