[151998] trunk/dports/lang/perl5

[mojca at macports.org]

Revision: 151998
          https://trac.macports.org/changeset/151998
Author:   mojca at macports.org
Date:     2016-08-26 03:25:24 -0700 (Fri, 26 Aug 2016)
Log Message:
-----------
perl5.22: do not compile for 10.3, always install to lib/perl5, proper flags, revbump (#51980)

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

Removed Paths:
-------------
    trunk/dports/lang/perl5/files/5.22/fix-ld-modification.patch

Modified: trunk/dports/lang/perl5/Portfile
===================================================================
--- trunk/dports/lang/perl5/Portfile	2016-08-26 10:13:39 UTC (rev 151997)
+++ trunk/dports/lang/perl5/Portfile	2016-08-26 10:25:24 UTC (rev 151998)
@@ -34,7 +34,7 @@
     5.16 3 2 f25fdd72449156a7cbe989e8bd339fdba1afabc0  bb7bc735e6813b177dcfccd480defcde7eddefa173b5967eac11babd1bfa98e8
     5.18 4 1 d97181a98f7acc80125b0d2a182a6a2cd7542ceb  1fb4d27b75cd244e849f253320260efe1750641aaff4a18ce0d67556ff1b96a5
     5.20 3 0 499846a1c92e00dd357cb782bc14787b8cd47051  1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b
-    5.22 2 0 203afca8995ca426db0af48b78eb606b5d24011a  f2322b9b04fe0cdbca9fe755360da04892cb6483d44959457cfebc0bcddc8058
+    5.22 2 1 203afca8995ca426db0af48b78eb606b5d24011a  f2322b9b04fe0cdbca9fe755360da04892cb6483d44959457cfebc0bcddc8058
     5.24 0 0 756bf07069e91eabe3dac3a47aec5097d48f8963  62328a53d157e8153b33e137594155f6f8b64418f7f9238210feb809585290e0
 }
 #   5.22 3-RC3 0 24f508e342cb824d96254e91ffd35b09ed740382  9074ac008f11aa5ea3df91a646fa8c23fec37923c729e06a8bc54be4fa710d07
@@ -70,6 +70,14 @@
                             ${perl5.major}/avoid-no-cpp-precomp-PR38913.patch \
                             ${perl5.major}/fix-ld-modification.patch
 
+        # Prevent build from picking up the bind9 port's static libbind, which
+        # duplicates symbols from /usr/lib/libdl (r10638).
+        patchfiles-append   ${perl5.major}/avoid-bind9-linking.patch
+
+        # Prevent miniperl linking from accidentally finding our libstdc++
+        # (#36438).
+        patchfiles-append   ${perl5.major}/fix-miniperl-linking-PR36438.patch
+
         if {${perl5.major} == 5.16} {
             patchfiles-append \
                             ${perl5.major}/use-stdbool.patch
@@ -88,20 +96,21 @@
                             ${perl5.major}/patch-dist-IO-t-cachepropagate-unix.t.diff
         }
         if {${perl5.major} == 5.24} {
-            # build error on Sierra (maybe also relevant for other perl versions?)
+            # Prevent build error on Sierra
             # https://trac.macports.org/ticket/52012
             patchfiles-append \
                             ${perl5.major}/patch-dist-Time-HiRes-HiRes.xs.diff
         }
+        # This should be added to other perl versions as well
+        if {${perl5.major} == 5.22} {
+            patchfiles-delete \
+                            ${perl5.major}/fix-ld-modification.patch
+            # Do not compile for 10.3/10.4
+            # https://trac.macports.org/ticket/51980
+            patchfiles-append \
+                            ${perl5.major}/remove-10.3-target-PR126360.patch
+        }
 
-        # Prevent build from picking up the bind9 port's static libbind, which
-        # duplicates symbols from /usr/lib/libdl (r10638).
-        patchfiles-append   ${perl5.major}/avoid-bind9-linking.patch
-
-        # Prevent miniperl linking from accidentally finding our libstdc++
-        # (#36438).
-        patchfiles-append   ${perl5.major}/fix-miniperl-linking-PR36438.patch
-
         post-patch {
             reinplace -W ${worksrcpath} "s|__PREFIX__|${prefix}|g" \
                     Configure Makefile.SH
@@ -138,11 +147,12 @@
         # flags with -A should be used for all versions of perl,
         # but for the time being we wanted to avoid rebuilding (revbumping) old perl version
         # so changing the flags is scheduled for later
-        if {${version} > 5.22} {
+        if {${version} >= 5.22} {
             configure.post_args-append \
                             {-Acppflags="$CPPFLAGS"} \
                             {-Accflags="$CFLAGS"} \
                             {-Aldflags="$LDFLAGS"} \
+                            {-Dinstallstyle="lib/perl5"}
         } else {
             configure.post_args-append \
                             {-Dcppflags="$CPPFLAGS"} \

Deleted: trunk/dports/lang/perl5/files/5.22/fix-ld-modification.patch
===================================================================
--- trunk/dports/lang/perl5/files/5.22/fix-ld-modification.patch	2016-08-26 10:13:39 UTC (rev 151997)
+++ trunk/dports/lang/perl5/files/5.22/fix-ld-modification.patch	2016-08-26 10:25:24 UTC (rev 151998)
@@ -1,13 +0,0 @@
-Index: hints/darwin.sh
-===================================================================
---- hints/darwin.sh.orig
-+++ hints/darwin.sh
-@@ -203,7 +203,7 @@ case "$osvers" in
-    # https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/cross_development/Configuring/configuring.html
-    lddlflags="${ldflags} -bundle -undefined dynamic_lookup"
-    case "$ld" in
--       *MACOSX_DEVELOPMENT_TARGET*) ;;
-+       *MACOSX_DEPLOYMENT_TARGET*) ;;
-        *) ld="env MACOSX_DEPLOYMENT_TARGET=10.3 ${ld}" ;;
-    esac
-    ;;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160826/31ee1a1a/attachment-0001.html>