| 1 |
commit: 2e39a7b89df99dce85a08af276ec31429b2be786 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 6 10:49:05 2018 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 6 10:49:05 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e39a7b8 |
| 7 |
|
| 8 |
dev-lang/perl: fix fix for #645804 during bootstrap |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/670836 |
| 11 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 12 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 13 |
|
| 14 |
dev-lang/perl/perl-5.26.2.ebuild | 4 ++-- |
| 15 |
dev-lang/perl/perl-5.26.9999.ebuild | 4 ++-- |
| 16 |
dev-lang/perl/perl-5.28.0.ebuild | 4 ++-- |
| 17 |
dev-lang/perl/perl-5.28.9999.ebuild | 4 ++-- |
| 18 |
4 files changed, 8 insertions(+), 8 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-lang/perl/perl-5.26.2.ebuild b/dev-lang/perl/perl-5.26.2.ebuild |
| 21 |
index 602748dc4a2..83fb285a198 100644 |
| 22 |
--- a/dev-lang/perl/perl-5.26.2.ebuild |
| 23 |
+++ b/dev-lang/perl/perl-5.26.2.ebuild |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-# Copyright 1999-2018 Gentoo Foundation |
| 26 |
+# Copyright 1999-2018 Gentoo Authors |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
EAPI=6 |
| 30 |
@@ -331,7 +331,7 @@ src_prepare() { |
| 31 |
fi |
| 32 |
|
| 33 |
# Use errno.h from prefix rather than from host system, bug #645804 |
| 34 |
- if use prefix && ! use prefix-guest; then |
| 35 |
+ if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then |
| 36 |
sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die |
| 37 |
fi |
| 38 |
|
| 39 |
|
| 40 |
diff --git a/dev-lang/perl/perl-5.26.9999.ebuild b/dev-lang/perl/perl-5.26.9999.ebuild |
| 41 |
index 602748dc4a2..83fb285a198 100644 |
| 42 |
--- a/dev-lang/perl/perl-5.26.9999.ebuild |
| 43 |
+++ b/dev-lang/perl/perl-5.26.9999.ebuild |
| 44 |
@@ -1,4 +1,4 @@ |
| 45 |
-# Copyright 1999-2018 Gentoo Foundation |
| 46 |
+# Copyright 1999-2018 Gentoo Authors |
| 47 |
# Distributed under the terms of the GNU General Public License v2 |
| 48 |
|
| 49 |
EAPI=6 |
| 50 |
@@ -331,7 +331,7 @@ src_prepare() { |
| 51 |
fi |
| 52 |
|
| 53 |
# Use errno.h from prefix rather than from host system, bug #645804 |
| 54 |
- if use prefix && ! use prefix-guest; then |
| 55 |
+ if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then |
| 56 |
sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die |
| 57 |
fi |
| 58 |
|
| 59 |
|
| 60 |
diff --git a/dev-lang/perl/perl-5.28.0.ebuild b/dev-lang/perl/perl-5.28.0.ebuild |
| 61 |
index 3fee6ac8677..c990d1af72b 100644 |
| 62 |
--- a/dev-lang/perl/perl-5.28.0.ebuild |
| 63 |
+++ b/dev-lang/perl/perl-5.28.0.ebuild |
| 64 |
@@ -1,4 +1,4 @@ |
| 65 |
-# Copyright 1999-2018 Gentoo Foundation |
| 66 |
+# Copyright 1999-2018 Gentoo Authors |
| 67 |
# Distributed under the terms of the GNU General Public License v2 |
| 68 |
|
| 69 |
EAPI=6 |
| 70 |
@@ -331,7 +331,7 @@ src_prepare() { |
| 71 |
fi |
| 72 |
|
| 73 |
# Use errno.h from prefix rather than from host system, bug #645804 |
| 74 |
- if use prefix && ! use prefix-guest; then |
| 75 |
+ if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then |
| 76 |
sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die |
| 77 |
fi |
| 78 |
|
| 79 |
|
| 80 |
diff --git a/dev-lang/perl/perl-5.28.9999.ebuild b/dev-lang/perl/perl-5.28.9999.ebuild |
| 81 |
index 3fee6ac8677..c990d1af72b 100644 |
| 82 |
--- a/dev-lang/perl/perl-5.28.9999.ebuild |
| 83 |
+++ b/dev-lang/perl/perl-5.28.9999.ebuild |
| 84 |
@@ -1,4 +1,4 @@ |
| 85 |
-# Copyright 1999-2018 Gentoo Foundation |
| 86 |
+# Copyright 1999-2018 Gentoo Authors |
| 87 |
# Distributed under the terms of the GNU General Public License v2 |
| 88 |
|
| 89 |
EAPI=6 |
| 90 |
@@ -331,7 +331,7 @@ src_prepare() { |
| 91 |
fi |
| 92 |
|
| 93 |
# Use errno.h from prefix rather than from host system, bug #645804 |
| 94 |
- if use prefix && ! use prefix-guest; then |
| 95 |
+ if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then |
| 96 |
sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die |
| 97 |
fi |
Archives