commit:     59e5b94ccd20a044eaa752ca5077c7d6d2b065b4
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  4 14:24:39 2017 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Nov  4 14:24:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59e5b94c

dev-lang/perl: Darwinism: Survival of the fittest command line switches. Bug 
636370

Closes: https://bugs.gentoo.org/636370
Package-Manager: Portage-2.3.13, Repoman-2.3.4

 dev-lang/perl/perl-5.26.1-r1.ebuild | 7 ++++++-
 dev-lang/perl/perl-5.26.9999.ebuild | 7 ++++++-
 dev-lang/perl/perl-5.28.9999.ebuild | 7 ++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/dev-lang/perl/perl-5.26.1-r1.ebuild 
b/dev-lang/perl/perl-5.26.1-r1.ebuild
index cf679447573..f4f6054d372 100644
--- a/dev-lang/perl/perl-5.26.1-r1.ebuild
+++ b/dev-lang/perl/perl-5.26.1-r1.ebuild
@@ -347,6 +347,12 @@ src_configure() {
        # Perl has problems compiling with -Os in your flags with glibc
        use elibc_uclibc || replace-flags "-Os" "-O2"
 
+       # xlocale.h is going away in glibc-2.26, so it's counterproductive
+       # if we use it and include it in CORE/perl.h ... Perl builds just
+       # fine with glibc and locale.h only.
+       # However, the darwin prefix people have no locale.h ...
+       use elibc_glibc && myconf -Ui_xlocale
+
        # This flag makes compiling crash in interesting ways
        filter-flags "-malign-double"
 
@@ -511,7 +517,6 @@ src_configure() {
                -Dsh="${EPREFIX}"/bin/sh \
                -Dtargetsh="${EPREFIX}"/bin/sh \
                -Uusenm \
-               -Ui_xlocale \
                "${myconf[@]}" \
                "${EXTRA_ECONF[@]}"
 

diff --git a/dev-lang/perl/perl-5.26.9999.ebuild 
b/dev-lang/perl/perl-5.26.9999.ebuild
index e8cc6de7891..3dc88edc18b 100644
--- a/dev-lang/perl/perl-5.26.9999.ebuild
+++ b/dev-lang/perl/perl-5.26.9999.ebuild
@@ -347,6 +347,12 @@ src_configure() {
        # Perl has problems compiling with -Os in your flags with glibc
        use elibc_uclibc || replace-flags "-Os" "-O2"
 
+       # xlocale.h is going away in glibc-2.26, so it's counterproductive
+       # if we use it and include it in CORE/perl.h ... Perl builds just
+       # fine with glibc and locale.h only.
+       # However, the darwin prefix people have no locale.h ...
+       use elibc_glibc && myconf -Ui_xlocale
+
        # This flag makes compiling crash in interesting ways
        filter-flags "-malign-double"
 
@@ -511,7 +517,6 @@ src_configure() {
                -Dsh="${EPREFIX}"/bin/sh \
                -Dtargetsh="${EPREFIX}"/bin/sh \
                -Uusenm \
-               -Ui_xlocale \
                "${myconf[@]}" \
                "${EXTRA_ECONF[@]}"
 

diff --git a/dev-lang/perl/perl-5.28.9999.ebuild 
b/dev-lang/perl/perl-5.28.9999.ebuild
index 610c4292771..70e967b70d3 100644
--- a/dev-lang/perl/perl-5.28.9999.ebuild
+++ b/dev-lang/perl/perl-5.28.9999.ebuild
@@ -347,6 +347,12 @@ src_configure() {
        # Perl has problems compiling with -Os in your flags with glibc
        use elibc_uclibc || replace-flags "-Os" "-O2"
 
+       # xlocale.h is going away in glibc-2.26, so it's counterproductive
+       # if we use it and include it in CORE/perl.h ... Perl builds just
+       # fine with glibc and locale.h only.
+       # However, the darwin prefix people have no locale.h ...
+       use elibc_glibc && myconf -Ui_xlocale
+
        # This flag makes compiling crash in interesting ways
        filter-flags "-malign-double"
 
@@ -511,7 +517,6 @@ src_configure() {
                -Dsh="${EPREFIX}"/bin/sh \
                -Dtargetsh="${EPREFIX}"/bin/sh \
                -Uusenm \
-               -Ui_xlocale \
                "${myconf[@]}" \
                "${EXTRA_ECONF[@]}"
 

Reply via email to