[113976] trunk/dports/lang
jeremyhu at macports.org
jeremyhu at macports.org
Tue Nov 26 14:09:25 PST 2013
Revision: 113976
https://trac.macports.org/changeset/113976
Author: jeremyhu at macports.org
Date: 2013-11-26 14:09:25 -0800 (Tue, 26 Nov 2013)
Log Message:
-----------
perl5.{8,10,12}: Fix application of usenm patch for Mavericks (#40521)
Modified Paths:
--------------
trunk/dports/lang/llvm-3.4/files/leopard-no-asan.patch
trunk/dports/lang/perl5.10/Portfile
trunk/dports/lang/perl5.12/Portfile
trunk/dports/lang/perl5.8/Portfile
Modified: trunk/dports/lang/llvm-3.4/files/leopard-no-asan.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/leopard-no-asan.patch 2013-11-26 22:00:24 UTC (rev 113975)
+++ trunk/dports/lang/llvm-3.4/files/leopard-no-asan.patch 2013-11-26 22:09:25 UTC (rev 113976)
@@ -2,33 +2,26 @@
===================================================================
--- llvm-3.3/projects/compiler-rt/make/platform/clang_darwin.mk (revision 185755)
+++ llvm-3.3/projects/compiler-rt/make/platform/clang_darwin.mk (working copy)
-@@ -70,12 +70,12 @@
+@@ -81,8 +81,8 @@ Configs += profile_ios
UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64 armv7,profile_ios)
# Configurations which define the ASAN support functions.
--Configs += asan_osx
--UniversalArchs.asan_osx := $(call CheckArches,i386 x86_64,asan_osx)
-+#Configs += asan_osx
-+#UniversalArchs.asan_osx := $(call CheckArches,i386 x86_64,asan_osx)
-+#
+-Configs += asan_osx_dynamic
+-UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64,asan_osx_dynamic)
+#Configs += asan_osx_dynamic
+#UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64,asan_osx_dynamic)
--Configs += asan_osx_dynamic
--UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64,asan_osx_dynamic)
--
Configs += ubsan_osx
UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64,ubsan_osx)
-
Index: llvm-3.3/tools/clang/runtime/compiler-rt/Makefile
===================================================================
---- llvm-3.3/tools/clang/runtime/compiler-rt/Makefile (revision 185755)
-+++ llvm-3.3/tools/clang/runtime/compiler-rt/Makefile (working copy)
-@@ -75,7 +75,6 @@
+--- llvm-3.4/tools/clang/runtime/compiler-rt/Makefile (revision 185755)
++++ llvm-3.4/tools/clang/runtime/compiler-rt/Makefile (working copy)
+@@ -77,7 +77,6 @@ ifeq ($(OS),Darwin)
RuntimeDirs += darwin
RuntimeLibrary.darwin.Configs := \
eprintf.a 10.4.a osx.a ios.a cc_kext.a cc_kext_ios5.a \
-- asan_osx.a asan_osx_dynamic.dylib \
+- asan_osx_dynamic.dylib \
profile_osx.a profile_ios.a \
ubsan_osx.a
endif
Modified: trunk/dports/lang/perl5.10/Portfile
===================================================================
--- trunk/dports/lang/perl5.10/Portfile 2013-11-26 22:00:24 UTC (rev 113975)
+++ trunk/dports/lang/perl5.10/Portfile 2013-11-26 22:09:25 UTC (rev 113976)
@@ -5,7 +5,7 @@
name perl5.10
version 5.10.1
-revision 6
+revision 7
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
license {Artistic-1 GPL}
@@ -35,17 +35,12 @@
platform darwin {
patchfiles-append patch-hints_darwin.sh.diff \
patch-perl.c.diff
-}
-platform darwin 11 {
- # bypass stupid check that assumes fprintf must be in libc.dylib
- patchfiles-append patch-hints_darwin.sh-usenm.diff
-}
-platform darwin 12 {
- # bypass stupid check that assumes fprintf must be in libc.dylib
- patchfiles-append patch-hints_darwin.sh-usenm.diff
-}
-platform darwin {
+ if {${os.major} >= 11} {
+ # bypass stupid check that assumes fprintf must be in libc.dylib
+ patchfiles-append patch-hints_darwin.sh-usenm.diff
+ }
+
# Prevent miniperl build from finding libstdcxx (#36438).
patchfiles-append patch-Makefile.SH.diff
post-patch {
Modified: trunk/dports/lang/perl5.12/Portfile
===================================================================
--- trunk/dports/lang/perl5.12/Portfile 2013-11-26 22:00:24 UTC (rev 113975)
+++ trunk/dports/lang/perl5.12/Portfile 2013-11-26 22:09:25 UTC (rev 113976)
@@ -5,7 +5,7 @@
name perl5.12
version 5.12.4
-revision 2
+revision 3
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
license {Artistic-1 GPL}
@@ -82,9 +82,11 @@
-D perlpath="${prefix}/bin/perl${branch}" \
-D startperl="#!${prefix}/bin/perl${branch}"
-platform darwin 11 {
- # bypass stupid check that assumes fprintf must be in libc.dylib
- patchfiles-append patch-hints_darwin.sh-usenm.diff
+platform darwin {
+ if {${os.major} >= 11} {
+ # bypass stupid check that assumes fprintf must be in libc.dylib
+ patchfiles-append patch-hints_darwin.sh-usenm.diff
+ }
}
# Allow perl to find p5-* ports installed by previous (minor) versions
Modified: trunk/dports/lang/perl5.8/Portfile
===================================================================
--- trunk/dports/lang/perl5.8/Portfile 2013-11-26 22:00:24 UTC (rev 113975)
+++ trunk/dports/lang/perl5.8/Portfile 2013-11-26 22:09:25 UTC (rev 113976)
@@ -5,7 +5,7 @@
name perl5.8
version 5.8.9
-revision 8
+revision 9
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
license {Artistic-1 GPL}
@@ -31,16 +31,11 @@
patchfiles patch-perl.c.diff patch-Configure.diff
-platform darwin 11 {
- # bypass stupid check that assumes fprintf must be in libc.dylib
- patchfiles-append patch-hints_darwin.sh-usenm.diff
-}
-platform darwin 12 {
- # bypass stupid check that assumes fprintf must be in libc.dylib
- patchfiles-append patch-hints_darwin.sh-usenm.diff
-}
-
platform darwin {
+ if {${os.major} >= 11} {
+ # bypass stupid check that assumes fprintf must be in libc.dylib
+ patchfiles-append patch-hints_darwin.sh-usenm.diff
+ }
# Prevent miniperl build from finding MacPorts' libstdcxx (#36438).
patchfiles-append patch-Makefile.SH.diff
post-patch {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131126/f26bf935/attachment.html>
More information about the macports-changes
mailing list