[105987] trunk/dports/lang/perl5.12

[larryv at macports.org]

Revision: 105987
          https://trac.macports.org/changeset/105987
Author:   larryv at macports.org
Date:     2013-05-11 23:54:38 -0700 (Sat, 11 May 2013)
Log Message:
-----------
perl5.12: Avoid unwanted miniperl linkage against libstdcxx (#36438).

Modified Paths:
--------------
    trunk/dports/lang/perl5.12/Portfile

Added Paths:
-----------
    trunk/dports/lang/perl5.12/files/patch-Makefile.SH.diff

Modified: trunk/dports/lang/perl5.12/Portfile
===================================================================
--- trunk/dports/lang/perl5.12/Portfile	2013-05-12 05:50:01 UTC (rev 105986)
+++ trunk/dports/lang/perl5.12/Portfile	2013-05-12 06:54:38 UTC (rev 105987)
@@ -32,6 +32,13 @@
 
 patchfiles	patch-Configure.diff patch-handy.h.stdbool.diff
 
+# While linking miniperl, remove LIBRARY_PATH and -L flags to keep
+# linker from using MacPorts' libstdcxx (#36438).
+patchfiles-append   patch-Makefile.SH.diff
+post-patch {
+    reinplace "s|__PREFIX_LIB__|${prefix}/lib|g" ${worksrcpath}/Makefile.SH
+}
+
 platform darwin {
     patchfiles-append   patch-hints_darwin.sh.diff
 ##    patchfiles-append   patch-hints_darwin.diff \

Added: trunk/dports/lang/perl5.12/files/patch-Makefile.SH.diff
===================================================================
--- trunk/dports/lang/perl5.12/files/patch-Makefile.SH.diff	                        (rev 0)
+++ trunk/dports/lang/perl5.12/files/patch-Makefile.SH.diff	2013-05-12 06:54:38 UTC (rev 105987)
@@ -0,0 +1,12 @@
+--- Makefile.SH.orig	2011-06-10 16:30:02.000000000 -0400
++++ Makefile.SH	2013-05-12 02:06:21.000000000 -0400
+@@ -822,7 +822,8 @@
+ 		$spitshell >>$Makefile <<'!NO!SUBS!'
+ $(MINIPERL_EXE): $& miniperlmain$(OBJ_EXT) $(mini_obj) opmini$(OBJ_EXT) perlmini$(OBJ_EXT)
+ 	- at rm -f miniperl.xok
+-	$(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
++	unset LIBRARY_PATH && \
++	$(CC) $(subst -L__PREFIX_LIB__,,$(CLDFLAGS)) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
+ 	    $(mini_obj) \
+ 	    miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perlmini$(OBJ_EXT) $(libs)
+ 	$(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130511/fce924b8/attachment.html>