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

diff --git a/dev-lang/perl/perl-5.26.1-r1.ebuild b/dev-lang/perl/perl-5.26.1-r1.ebuild
index cf6794475736fa89a25ae6f9d038d3f67cd41ac1..f4f6054d3728e3e4cade507cc6ffc35a81caf9af 100644 (file)
--- 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 e8cc6de7891fe1edb53787e586cd7045bd433766..3dc88edc18b60a3a4ccc1633c996f93a8d2d39ed 100644 (file)
--- 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 610c42927718be333dc3745aaec415a79a3da9c3..70e967b70d3e245dc395c34eca388e2cec06775c 100644 (file)
--- 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[@]}"