[151549] trunk/dports/lang/perl5

[mojca at macports.org]

Revision: 151549
          https://trac.macports.org/changeset/151549
Author:   mojca at macports.org
Date:     2016-08-17 05:40:53 -0700 (Wed, 17 Aug 2016)
Log Message:
-----------
perl5: apply the patch for Sierra to perl5.22 as well (#52012)

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

Added Paths:
-----------
    trunk/dports/lang/perl5/files/5.22/patch-dist-Time-HiRes-HiRes.xs.diff

Modified: trunk/dports/lang/perl5/Portfile
===================================================================
--- trunk/dports/lang/perl5/Portfile	2016-08-17 12:40:24 UTC (rev 151548)
+++ trunk/dports/lang/perl5/Portfile	2016-08-17 12:40:53 UTC (rev 151549)
@@ -82,15 +82,11 @@
                             ${perl5.major}/install-under-short-version-PR43480.patch \
         }
         if {${perl5.major} >= 5.22} {
+            # build error on Sierra
+            # https://trac.macports.org/ticket/52012
             # failed test
             # https://trac.macports.org/ticket/51327
             patchfiles-append \
-                            ${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?)
-            # https://trac.macports.org/ticket/52012
-            patchfiles-append \
                             ${perl5.major}/patch-dist-Time-HiRes-HiRes.xs.diff \
                             ${perl5.major}/patch-dist-IO-t-cachepropagate-unix.t.diff
         }

Copied: trunk/dports/lang/perl5/files/5.22/patch-dist-Time-HiRes-HiRes.xs.diff (from rev 151547, trunk/dports/lang/perl5/files/5.24/patch-dist-Time-HiRes-HiRes.xs.diff)
===================================================================
--- trunk/dports/lang/perl5/files/5.22/patch-dist-Time-HiRes-HiRes.xs.diff	                        (rev 0)
+++ trunk/dports/lang/perl5/files/5.22/patch-dist-Time-HiRes-HiRes.xs.diff	2016-08-17 12:40:53 UTC (rev 151549)
@@ -0,0 +1,14 @@
+https://trac.macports.org/ticket/52012
+https://github.com/Homebrew/homebrew-core/issues/1957#issuecomment-226850273
+
+--- dist/Time-HiRes/HiRes.xs.orig
++++ dist/Time-HiRes/HiRes.xs
+@@ -940,7 +940,7 @@ BOOT:
+   }
+ #   endif
+ #endif
+-#if defined(PERL_DARWIN)
++#if defined(PERL_DARWIN) && !defined(CLOCK_REALTIME)
+ #  ifdef USE_ITHREADS
+   MUTEX_INIT(&darwin_time_mutex);
+ #  endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160817/b050a602/attachment.html>