[105992] trunk/dports/lang

larryv at macports.org larryv at macports.org
Sun May 12 11:30:08 PDT 2013 

Revision: 105992
          https://trac.macports.org/changeset/105992
Author:   larryv at macports.org
Date:     2013-05-12 11:30:08 -0700 (Sun, 12 May 2013)
Log Message:
-----------
perl5.{8,10,14,16}: Prevent miniperl build from finding libstdcxx (#36438).

Modified Paths:
--------------
    trunk/dports/lang/perl5.10/Portfile
    trunk/dports/lang/perl5.14/Portfile
    trunk/dports/lang/perl5.16/Portfile
    trunk/dports/lang/perl5.8/Portfile

Added Paths:
-----------
    trunk/dports/lang/perl5.10/files/patch-Makefile.SH.diff
    trunk/dports/lang/perl5.14/files/patch-Makefile.SH.diff
    trunk/dports/lang/perl5.16/files/patch-Makefile.SH.diff
    trunk/dports/lang/perl5.8/files/patch-Makefile.SH.diff

Modified: trunk/dports/lang/perl5.10/Portfile
===================================================================
--- trunk/dports/lang/perl5.10/Portfile	2013-05-12 18:28:26 UTC (rev 105991)
+++ trunk/dports/lang/perl5.10/Portfile	2013-05-12 18:30:08 UTC (rev 105992)
@@ -45,6 +45,14 @@
     patchfiles-append   patch-hints_darwin.sh-usenm.diff
 }
 
+platform darwin {
+    # Prevent miniperl build from finding libstdcxx (#36438).
+    patchfiles-append   patch-Makefile.SH.diff
+    post-patch {
+        reinplace "s|__PREFIX_LIB__|${prefix}/lib|g" ${worksrcpath}/Makefile.SH
+    }
+}
+
 pre-configure {
     reinplace "s|/opt/local|${prefix}|g" ${worksrcpath}/Configure
 }

Added: trunk/dports/lang/perl5.10/files/patch-Makefile.SH.diff
===================================================================
--- trunk/dports/lang/perl5.10/files/patch-Makefile.SH.diff	                        (rev 0)
+++ trunk/dports/lang/perl5.10/files/patch-Makefile.SH.diff	2013-05-12 18:30:08 UTC (rev 105992)
@@ -0,0 +1,12 @@
+--- Makefile.SH.orig	2009-08-03 16:43:30.000000000 -0400
++++ Makefile.SH	2013-05-12 14:06:09.000000000 -0400
+@@ -803,7 +803,8 @@
+ 		$spitshell >>$Makefile <<'!NO!SUBS!'
+ miniperl$(EXE_EXT): $& miniperlmain$(OBJ_EXT) $(mini_obj) opmini$(OBJ_EXT) perlmini$(OBJ_EXT)
+ 	- at rm -f miniperl.xok
+-	$(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o miniperl$(EXE_EXT) \
++	unset LIBRARY_PATH && \
++	$(CC) $(subst -L__PREFIX_LIB__,,$(CLDFLAGS)) $(NAMESPACEFLAGS) -o miniperl$(EXE_EXT) \
+ 	    $(mini_obj) \
+ 	    miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perlmini$(OBJ_EXT) $(libs)
+ 	$(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest

Modified: trunk/dports/lang/perl5.14/Portfile
===================================================================
--- trunk/dports/lang/perl5.14/Portfile	2013-05-12 18:28:26 UTC (rev 105991)
+++ trunk/dports/lang/perl5.14/Portfile	2013-05-12 18:30:08 UTC (rev 105992)
@@ -36,6 +36,12 @@
     patchfiles-append   patch-hints_darwin.sh.diff
 ##    patchfiles-append   patch-hints_darwin.diff \
 ## 						patch-perl.c.diff
+
+    # Prevent miniperl build from finding libstdcxx (#36438).
+    patchfiles-append   patch-Makefile.SH.diff
+    post-patch {
+        reinplace "s|__PREFIX_LIB__|${prefix}/lib|g" ${worksrcpath}/Makefile.SH
+    }
 }
 
 pre-configure {

Added: trunk/dports/lang/perl5.14/files/patch-Makefile.SH.diff
===================================================================
--- trunk/dports/lang/perl5.14/files/patch-Makefile.SH.diff	                        (rev 0)
+++ trunk/dports/lang/perl5.14/files/patch-Makefile.SH.diff	2013-05-12 18:30:08 UTC (rev 105992)
@@ -0,0 +1,12 @@
+--- Makefile.SH.orig	2011-09-26 05:44:34.000000000 -0400
++++ Makefile.SH	2013-05-12 13:05:36.000000000 -0400
+@@ -830,7 +830,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

Modified: trunk/dports/lang/perl5.16/Portfile
===================================================================
--- trunk/dports/lang/perl5.16/Portfile	2013-05-12 18:28:26 UTC (rev 105991)
+++ trunk/dports/lang/perl5.16/Portfile	2013-05-12 18:30:08 UTC (rev 105992)
@@ -35,6 +35,12 @@
     patchfiles-append   patch-hints_darwin.sh.diff
 ##    patchfiles-append   patch-hints_darwin.diff \
 ## 						patch-perl.c.diff
+
+    # Prevent miniperl build from finding libstdcxx (#36438).
+    patchfiles-append   patch-Makefile.SH.diff
+    post-patch {
+        reinplace "s|__PREFIX_LIB__|${prefix}/lib|g" ${worksrcpath}/Makefile.SH
+    }
 }
 
 pre-configure {

Added: trunk/dports/lang/perl5.16/files/patch-Makefile.SH.diff
===================================================================
--- trunk/dports/lang/perl5.16/files/patch-Makefile.SH.diff	                        (rev 0)
+++ trunk/dports/lang/perl5.16/files/patch-Makefile.SH.diff	2013-05-12 18:30:08 UTC (rev 105992)
@@ -0,0 +1,12 @@
+--- Makefile.SH.orig	2012-08-03 13:35:26.000000000 -0400
++++ Makefile.SH	2013-05-12 13:36:28.000000000 -0400
+@@ -860,7 +860,8 @@
+ 		$spitshell >>$Makefile <<'!NO!SUBS!'
+ $(MINIPERL_EXE): $& $(mini_obj)
+ 	- 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) $(libs)
+ 	$(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
+ !NO!SUBS!

Modified: trunk/dports/lang/perl5.8/Portfile
===================================================================
--- trunk/dports/lang/perl5.8/Portfile	2013-05-12 18:28:26 UTC (rev 105991)
+++ trunk/dports/lang/perl5.8/Portfile	2013-05-12 18:30:08 UTC (rev 105992)
@@ -40,6 +40,14 @@
     patchfiles-append   patch-hints_darwin.sh-usenm.diff
 }
 
+platform darwin {
+    # Prevent miniperl build from finding MacPorts' libstdcxx (#36438).
+    patchfiles-append   patch-Makefile.SH.diff
+    post-patch {
+        reinplace "s|__PREFIX_LIB__|${prefix}/lib|g" ${worksrcpath}/Makefile.SH
+    }
+}
+
 post-patch {
     reinplace "s|/opt/local|${prefix}|g" ${worksrcpath}/Configure
     # Ensure that the ld value set in configure.args is used

Added: trunk/dports/lang/perl5.8/files/patch-Makefile.SH.diff
===================================================================
--- trunk/dports/lang/perl5.8/files/patch-Makefile.SH.diff	                        (rev 0)
+++ trunk/dports/lang/perl5.8/files/patch-Makefile.SH.diff	2013-05-12 18:30:08 UTC (rev 105992)
@@ -0,0 +1,12 @@
+--- Makefile.SH.orig	2008-12-06 07:11:01.000000000 -0500
++++ Makefile.SH	2013-05-12 13:55:03.000000000 -0400
+@@ -696,7 +696,8 @@
+ 		$spitshell >>Makefile <<'!NO!SUBS!'
+ miniperl$(EXE_EXT): $& miniperlmain$(OBJ_EXT) $(obj) opmini$(OBJ_EXT)
+ 	- at rm -f miniperl.xok
+-	$(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o miniperl \
++	unset LIBRARY_PATH && \
++	$(CC) $(subst -L__PREFIX_LIB__,,$(CLDFLAGS)) $(NAMESPACEFLAGS) -o miniperl \
+ 	    `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \
+ 	    miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(libs)
+ 	$(LDLIBPTH) $(RUN) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130512/7889da94/attachment.html>

More information about the macports-changes mailing list