Changeset 113976


Ignore:
Timestamp:
Nov 26, 2013, 10:09:25 PM (6 years ago)
Author:
jeremyhu@…
Message:

perl5.{8,10,12}: Fix application of usenm patch for Mavericks (#40521)

Location:
trunk/dports/lang
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/lang/llvm-3.4/files/leopard-no-asan.patch

    r107829 r113976  
    33--- llvm-3.3/projects/compiler-rt/make/platform/clang_darwin.mk (revision 185755)
    44+++ llvm-3.3/projects/compiler-rt/make/platform/clang_darwin.mk (working copy)
    5 @@ -70,12 +70,12 @@
     5@@ -81,8 +81,8 @@ Configs += profile_ios
    66 UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64 armv7,profile_ios)
    77 
    88 # Configurations which define the ASAN support functions.
    9 -Configs += asan_osx
    10 -UniversalArchs.asan_osx := $(call CheckArches,i386 x86_64,asan_osx)
    11 +#Configs += asan_osx
    12 +#UniversalArchs.asan_osx := $(call CheckArches,i386 x86_64,asan_osx)
    13 +#
     9-Configs += asan_osx_dynamic
     10-UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64,asan_osx_dynamic)
    1411+#Configs += asan_osx_dynamic
    1512+#UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64,asan_osx_dynamic)
    1613 
    17 -Configs += asan_osx_dynamic
    18 -UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64,asan_osx_dynamic)
    19 -
    2014 Configs += ubsan_osx
    2115 UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64,ubsan_osx)
    22  
    2316Index: llvm-3.3/tools/clang/runtime/compiler-rt/Makefile
    2417===================================================================
    25 --- llvm-3.3/tools/clang/runtime/compiler-rt/Makefile   (revision 185755)
    26 +++ llvm-3.3/tools/clang/runtime/compiler-rt/Makefile   (working copy)
    27 @@ -75,7 +75,6 @@
     18--- llvm-3.4/tools/clang/runtime/compiler-rt/Makefile   (revision 185755)
     19+++ llvm-3.4/tools/clang/runtime/compiler-rt/Makefile   (working copy)
     20@@ -77,7 +77,6 @@ ifeq ($(OS),Darwin)
    2821 RuntimeDirs += darwin
    2922 RuntimeLibrary.darwin.Configs := \
    3023        eprintf.a 10.4.a osx.a ios.a cc_kext.a cc_kext_ios5.a \
    31 -       asan_osx.a asan_osx_dynamic.dylib \
     24-       asan_osx_dynamic.dylib \
    3225        profile_osx.a profile_ios.a \
    3326        ubsan_osx.a
  • trunk/dports/lang/perl5.10/Portfile

    r112361 r113976  
    66name            perl5.10
    77version         5.10.1
    8 revision        6
     8revision        7
    99set branch      [join [lrange [split ${version} .] 0 1] .]
    1010categories      lang
     
    3636    patchfiles-append   patch-hints_darwin.sh.diff \
    3737                                                patch-perl.c.diff
    38 }
    39 platform darwin 11 {
    40     # bypass stupid check that assumes fprintf must be in libc.dylib
    41     patchfiles-append   patch-hints_darwin.sh-usenm.diff
    42 }
    43 platform darwin 12 {
    44     # bypass stupid check that assumes fprintf must be in libc.dylib
    45     patchfiles-append   patch-hints_darwin.sh-usenm.diff
    46 }
    4738
    48 platform darwin {
     39    if {${os.major} >= 11} {
     40        # bypass stupid check that assumes fprintf must be in libc.dylib
     41        patchfiles-append   patch-hints_darwin.sh-usenm.diff
     42    }
     43
    4944    # Prevent miniperl build from finding libstdcxx (#36438).
    5045    patchfiles-append   patch-Makefile.SH.diff
  • trunk/dports/lang/perl5.12/Portfile

    r112361 r113976  
    66name            perl5.12
    77version         5.12.4
    8 revision        2
     8revision        3
    99set branch      [join [lrange [split ${version} .] 0 1] .]
    1010categories      lang
     
    8383                                        -D startperl="#!${prefix}/bin/perl${branch}"
    8484
    85 platform darwin 11 {
    86     # bypass stupid check that assumes fprintf must be in libc.dylib
    87     patchfiles-append patch-hints_darwin.sh-usenm.diff
     85platform darwin {
     86    if {${os.major} >= 11} {
     87        # bypass stupid check that assumes fprintf must be in libc.dylib
     88        patchfiles-append   patch-hints_darwin.sh-usenm.diff
     89    }
    8890}
    8991
  • trunk/dports/lang/perl5.8/Portfile

    r112361 r113976  
    66name            perl5.8
    77version         5.8.9
    8 revision        8
     8revision        9
    99set branch      [join [lrange [split ${version} .] 0 1] .]
    1010categories      lang
     
    3232patchfiles  patch-perl.c.diff patch-Configure.diff
    3333
    34 platform darwin 11 {
    35     # bypass stupid check that assumes fprintf must be in libc.dylib
    36     patchfiles-append   patch-hints_darwin.sh-usenm.diff
    37 }
    38 platform darwin 12 {
    39     # bypass stupid check that assumes fprintf must be in libc.dylib
    40     patchfiles-append   patch-hints_darwin.sh-usenm.diff
    41 }
    42 
    4334platform darwin {
     35    if {${os.major} >= 11} {
     36        # bypass stupid check that assumes fprintf must be in libc.dylib
     37        patchfiles-append   patch-hints_darwin.sh-usenm.diff
     38    }
    4439    # Prevent miniperl build from finding MacPorts' libstdcxx (#36438).
    4540    patchfiles-append   patch-Makefile.SH.diff
Note: See TracChangeset for help on using the changeset viewer.