Revision
81637
Author
ryandesign@macports.org
Date
2011-08-03 00:59:14 -0700 (Wed, 03 Aug 2011)

Log Message

p5-net-libidn: fix build with clang; see #30560

Modified Paths

Diff

Modified: trunk/dports/perl/p5-net-libidn/Portfile (81636 => 81637)


--- trunk/dports/perl/p5-net-libidn/Portfile	2011-08-03 07:30:14 UTC (rev 81636)
+++ trunk/dports/perl/p5-net-libidn/Portfile	2011-08-03 07:59:14 UTC (rev 81637)
@@ -22,11 +22,14 @@
 patchfiles-append       patch-Makefile.PL.diff
 
 post-patch {
-    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
+        set archflags ${configure.universal_cflags}
     } else {
-        reinplace "s|@CFLAGS@|${configure.cppflags} ${configure.cc_archflags}|g" ${worksrcpath}/Makefile.PL
+        set archflags ${configure.cc_archflags}
     }
+    
+    reinplace "s|@CC@|${configure.cc} ${archflags}|g" ${worksrcpath}/Makefile.PL
 }
+
+configure.args-append   --with-libidn=${prefix}/lib \
+                        --with-libidn-inc=${prefix}/include

Modified: trunk/dports/perl/p5-net-libidn/files/patch-Makefile.PL.diff (81636 => 81637)


--- trunk/dports/perl/p5-net-libidn/files/patch-Makefile.PL.diff	2011-08-03 07:30:14 UTC (rev 81636)
+++ trunk/dports/perl/p5-net-libidn/files/patch-Makefile.PL.diff	2011-08-03 07:59:14 UTC (rev 81637)
@@ -1,14 +1,5 @@
 --- 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;
  	}