Changeset 80733

Timestamp:

07/16/11 10:06:26 (4 years ago)

Author:

jeremyhu@…

Message:

p5-net-libidn: Build fix for building -universal with a +universal perl. Dev ack via email.

Location:

trunk/dports/perl/p5-net-libidn

Files:

• Portfile (modified) (1 diff)
• files/patch-Makefile.PL.diff (modified) (2 diffs)

trunk/dports/perl/p5-net-libidn/Portfile

@@ -22 +22 @@
 
 post-patch {
-    reinplace "s|@CC@|${configure.cc} ${configure.cppflags}|g" ${worksrcpath}/Makefile.PL
+    reinplace "s|@CC@|${configure.cc}|g" ${worksrcpath}/Makefile.PL
+
+    if {[variant_isset universal]} {
+        reinplace "s|@CFLAGS@|${configure.cppflags} ${configure.universal_cflags}|g" ${worksrcpath}/Makefile.PL
+    } else {
+        reinplace "s|@CFLAGS@|${configure.cppflags} ${configure.cc_archflags}|g" ${worksrcpath}/Makefile.PL
+    }
 }
-
-configure.env           C_INCLUDE_PATH="${prefix}/include" \
-                        LIBRARY_PATH="${prefix}/lib"

trunk/dports/perl/p5-net-libidn/files/patch-Makefile.PL.diff

@@ -1 @@
---- Makefile.PL.orig    2007-12-12 16:28:08.000000000 -0600
-+++ Makefile.PL 2009-07-17 02:01:17.000000000 -0500
-@@ -167,7 +167,7 @@
+--- Makefile.PL.orig    2011-07-15 22:50:57.000000000 -0700
++++ Makefile.PL 2011-07-15 22:53:15.000000000 -0700
+@@ -65,7 +65,7 @@ sub InitMakeParams
+                $Params{INC} = '';
+        }
+ 
+-       my $libidn = CheckLibidn($Params{INC}, $Params{LIBS});
++       my $libidn = CheckLibidn("@CFLAGS@", "-lidn");
+ 
+        unless($libidn)
+        {
+@@ -165,7 +165,7 @@ sub CheckCCode
                 return 0;
         }
@@ -9 +18 @@
         {
                 unlink($test);
-                system "$cc $cflags $ldflags -o $test $test.c";
+                system "$cc $cflags -o $test $test.c $ldflags";