<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/15202867f0795c2e5b45dfcadd7cac25f14190c1">https://github.com/macports/macports-ports/commit/15202867f0795c2e5b45dfcadd7cac25f14190c1</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 1520286 p5-locale-gettext: Fix build for nondefault archs
</span>1520286 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 15202867f0795c2e5b45dfcadd7cac25f14190c1
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Oct 30 15:17:02 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> p5-locale-gettext: Fix build for nondefault archs
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use CFLAGS, CPPFLAGS, LDFLAGS while configuring. This also makes it
</span><span style='display:block; white-space:pre;color:#404040;'> unnecessary for us to prevent the use of compilers that don't have
</span><span style='display:block; white-space:pre;color:#404040;'> support for CPATH and LIBRARY_PATH.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/50462
</span>---
perl/p5-locale-gettext/Portfile | 3 ---
perl/p5-locale-gettext/files/patch-Makefile.PL | 27 +++++++++++++++++++++-----
2 files changed, 22 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-locale-gettext/Portfile b/perl/p5-locale-gettext/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 30b024e..391669c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-locale-gettext/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-locale-gettext/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,9 +26,6 @@ if {${perl5.major} != ""} {
</span> port:libiconv
patchfiles patch-Makefile.PL
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# These clangs don't understand CPATH / LIBRARY_PATH and configure failures result.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append {clang < 319}
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-locale-gettext/files/patch-Makefile.PL b/perl/p5-locale-gettext/files/patch-Makefile.PL
</span><span style='display:block; white-space:pre;color:#808080;'>index f42d446..5d3af11 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-locale-gettext/files/patch-Makefile.PL
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-locale-gettext/files/patch-Makefile.PL
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +1,25 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.PL.orig 2015-10-30 15:37:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.PL 2015-10-30 15:38:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,6 +7,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.PL.orig 2015-09-18 12:06:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.PL 2018-10-30 15:03:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,6 +7,18 @@
</span> } else {
$cc = $Config{'cc'};
}
+my $cflags = '';
+if (defined($ENV{'CFLAGS'})) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $cflags = $ENV{'CFLAGS'};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $cflags = $ENV{'CFLAGS'};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++my $cppflags = '';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if (defined($ENV{'CPPFLAGS'})) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $cppflags = $ENV{'CPPFLAGS'};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++my $ldflags = '';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if (defined($ENV{'LDFLAGS'})) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $ldflags = $ENV{'LDFLAGS'};
</span> +}
my $libs = '';
unless (conftest("char *x = gettext(\"foo\");", "gettext", 0)) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,6 +39,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,6 +47,8 @@
</span> NAME => "Locale::gettext",
LIBS => ($libs eq '') ? [] : [$libs],
VERSION_FROM => 'gettext.pm',
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,3 +28,12 @@
</span> META_MERGE => {
resources => {
repository => 'https://github.com/vandry/Perl-Locale-gettext',
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,7 +73,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close TEST;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ open(SAVE, ">&STDERR");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ open(STDERR, ">/dev/null");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- system($cc . " -o conftest " . " conftest.c " . $libs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ system($cc . " -o conftest " . " conftest.c " . $cflags . " " . $cppflags . " " . $ldflags . " " . $libs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $exitstatus = $?;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ open(STDERR, ">&SAVE");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ($exitstatus != 0) {
</span></pre><pre style='margin:0'>
</pre>