[131809] trunk/dports/lang

jeremyhu at macports.org jeremyhu at macports.org
Mon Jan 19 00:13:19 PST 2015 

Revision: 131809
          https://trac.macports.org/changeset/131809
Author:   jeremyhu at macports.org
Date:     2015-01-19 00:13:18 -0800 (Mon, 19 Jan 2015)
Log Message:
-----------
llvm-3.[67]: Remove disable-arm-runtime.patch patch as current compiler-rt determines this automatically

Modified Paths:
--------------
    trunk/dports/lang/llvm-3.6/Portfile
    trunk/dports/lang/llvm-3.7/Portfile
    trunk/dports/lang/llvm-3.7/files/leopard-no-asan.patch

Removed Paths:
-------------
    trunk/dports/lang/llvm-3.6/files/disable-arm-runtime.patch
    trunk/dports/lang/llvm-3.7/files/disable-arm-runtime.patch

Modified: trunk/dports/lang/llvm-3.6/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.6/Portfile	2015-01-19 07:13:08 UTC (rev 131808)
+++ trunk/dports/lang/llvm-3.6/Portfile	2015-01-19 08:13:18 UTC (rev 131809)
@@ -126,11 +126,6 @@
     patchfiles-delete \
         0005-MacPorts-Only-Skip-checking-for-python-in-configure.patch
 
-    if {![variant_isset arm_runtime]} {
-        # Alternate fix for #33272.
-        patchfiles-append   disable-arm-runtime.patch
-    }
-
     build.target        clang-only
     destroot.target     install-clang
 }
@@ -310,13 +305,6 @@
         destroot.args-append  OVERRIDE_libdir=${sub_prefix}/lib
     }
 } elseif {${subport} eq "clang-${llvm_version}"} {
-    variant arm_runtime description {Build and install the arm runtime for iOS development (requires iOS SDK)} {}
-
-    # The iOS SDK was shipped with all Xcode releases after 4.0
-    if {[info exists xcodeversion] && [vercmp "4.0" ${xcodeversion}] <= 0} {
-       default_variants-append +arm_runtime
-    }
-
     variant analyzer description {Install clang static analyzer} {
         depends_run-append port:perl5
 

Deleted: trunk/dports/lang/llvm-3.6/files/disable-arm-runtime.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/disable-arm-runtime.patch	2015-01-19 07:13:08 UTC (rev 131808)
+++ trunk/dports/lang/llvm-3.6/files/disable-arm-runtime.patch	2015-01-19 08:13:18 UTC (rev 131809)
@@ -1,36 +0,0 @@
-Index: llvm-3.6svn/projects/compiler-rt/make/platform/clang_darwin.mk
-===================================================================
---- llvm-3.6svn.orig/projects/compiler-rt/make/platform/clang_darwin.mk
-+++ llvm-3.6svn/projects/compiler-rt/make/platform/clang_darwin.mk
-@@ -101,7 +101,6 @@ UniversalArchs.cc_kext += $(call CheckAr
- # Configuration for use with kernel/kexts for iOS 5.0 and earlier (which used 
- # a different code generation strategy). Note: the x86_64 slice is unused but
- # it avoids build problems (see pr14013).
--Configs += cc_kext_ios5
- UniversalArchs.cc_kext_ios5 := $(call CheckArches,x86_64,cc_kext_ios5,$(IOSSIM_SDK))
- UniversalArchs.cc_kext_ios5 += $(call CheckArches,armv7,cc_kext_ios5,$(IOS_SDK))
- 
-@@ -133,6 +132,8 @@ UniversalArchs.ubsan_osx := $(call Check
- #UniversalArchs.profile_ios := $(filter-out armv7, $(UniversalArchs.profile_ios))
- #endif
- 
-+RC_SUPPORTED_ARCHS := ppc i386 x86_64 x86_64h
-+
- # If RC_SUPPORTED_ARCHS is defined, treat it as a list of the architectures we
- # are intended to support and limit what we try to build to that.
- ifneq ($(RC_SUPPORTED_ARCHS),)
-Index: llvm-3.6svn/tools/clang/runtime/compiler-rt/Makefile
-===================================================================
---- llvm-3.6svn.orig/tools/clang/runtime/compiler-rt/Makefile
-+++ llvm-3.6svn/tools/clang/runtime/compiler-rt/Makefile
-@@ -99,10 +99,6 @@ ifneq ($(IOS_SDK)$(IOSSIM_SDK),)
- RuntimeLibrary.darwin.Configs += ios.a profile_ios.a
- endif
- 
--ifneq ($(IOS_SDK),)
--RuntimeLibrary.darwin.Configs += cc_kext_ios5.a
--endif
--
- ifneq ($(IOSSIM_SDK),)
- RuntimeLibrary.darwin.Configs += asan_iossim_dynamic.dylib
- endif

Modified: trunk/dports/lang/llvm-3.7/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.7/Portfile	2015-01-19 07:13:08 UTC (rev 131808)
+++ trunk/dports/lang/llvm-3.7/Portfile	2015-01-19 08:13:18 UTC (rev 131809)
@@ -126,11 +126,6 @@
     patchfiles-delete \
         0005-MacPorts-Only-Skip-checking-for-python-in-configure.patch
 
-    if {![variant_isset arm_runtime]} {
-        # Alternate fix for #33272.
-        patchfiles-append   disable-arm-runtime.patch
-    }
-
     build.target        clang-only
     destroot.target     install-clang
 }
@@ -310,13 +305,6 @@
         destroot.args-append  OVERRIDE_libdir=${sub_prefix}/lib
     }
 } elseif {${subport} eq "clang-${llvm_version}"} {
-    variant arm_runtime description {Build and install the arm runtime for iOS development (requires iOS SDK)} {}
-
-    # The iOS SDK was shipped with all Xcode releases after 4.0
-    if {[info exists xcodeversion] && [vercmp "4.0" ${xcodeversion}] <= 0} {
-       default_variants-append +arm_runtime
-    }
-
     variant analyzer description {Install clang static analyzer} {
         depends_run-append port:perl5
 

Deleted: trunk/dports/lang/llvm-3.7/files/disable-arm-runtime.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/disable-arm-runtime.patch	2015-01-19 07:13:08 UTC (rev 131808)
+++ trunk/dports/lang/llvm-3.7/files/disable-arm-runtime.patch	2015-01-19 08:13:18 UTC (rev 131809)
@@ -1,36 +0,0 @@
-Index: llvm-3.6svn/projects/compiler-rt/make/platform/clang_darwin.mk
-===================================================================
---- llvm-3.6svn.orig/projects/compiler-rt/make/platform/clang_darwin.mk
-+++ llvm-3.6svn/projects/compiler-rt/make/platform/clang_darwin.mk
-@@ -101,7 +101,6 @@ UniversalArchs.cc_kext += $(call CheckAr
- # Configuration for use with kernel/kexts for iOS 5.0 and earlier (which used 
- # a different code generation strategy). Note: the x86_64 slice is unused but
- # it avoids build problems (see pr14013).
--Configs += cc_kext_ios5
- UniversalArchs.cc_kext_ios5 := $(call CheckArches,x86_64,cc_kext_ios5,$(IOSSIM_SDK))
- UniversalArchs.cc_kext_ios5 += $(call CheckArches,armv7,cc_kext_ios5,$(IOS_SDK))
- 
-@@ -133,6 +132,8 @@ UniversalArchs.ubsan_osx := $(call Check
- #UniversalArchs.profile_ios := $(filter-out armv7, $(UniversalArchs.profile_ios))
- #endif
- 
-+RC_SUPPORTED_ARCHS := ppc i386 x86_64 x86_64h
-+
- # If RC_SUPPORTED_ARCHS is defined, treat it as a list of the architectures we
- # are intended to support and limit what we try to build to that.
- ifneq ($(RC_SUPPORTED_ARCHS),)
-Index: llvm-3.6svn/tools/clang/runtime/compiler-rt/Makefile
-===================================================================
---- llvm-3.6svn.orig/tools/clang/runtime/compiler-rt/Makefile
-+++ llvm-3.6svn/tools/clang/runtime/compiler-rt/Makefile
-@@ -99,10 +99,6 @@ ifneq ($(IOS_SDK)$(IOSSIM_SDK),)
- RuntimeLibrary.darwin.Configs += ios.a profile_ios.a
- endif
- 
--ifneq ($(IOS_SDK),)
--RuntimeLibrary.darwin.Configs += cc_kext_ios5.a
--endif
--
- ifneq ($(IOSSIM_SDK),)
- RuntimeLibrary.darwin.Configs += asan_iossim_dynamic.dylib
- endif

Modified: trunk/dports/lang/llvm-3.7/files/leopard-no-asan.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/leopard-no-asan.patch	2015-01-19 07:13:08 UTC (rev 131808)
+++ trunk/dports/lang/llvm-3.7/files/leopard-no-asan.patch	2015-01-19 08:13:18 UTC (rev 131809)
@@ -1,3 +1,22 @@
+--- a/projects/compiler-rt/make/platform/clang_darwin.mk.orig	2015-01-10 03:41:48.000000000 -0800
++++ b/projects/compiler-rt/make/platform/clang_darwin.mk	2015-01-10 04:13:39.000000000 -0800
+@@ -115,13 +115,13 @@ UniversalArchs.profile_ios := $(call Che
+ UniversalArchs.profile_ios += $(call CheckArches,armv7,profile_ios,$(IOS_SDK))
+ 
+ # Configurations which define the ASAN support functions.
+-Configs += asan_osx_dynamic
++#Configs += asan_osx_dynamic
+ UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64 x86_64h,asan_osx_dynamic,$(OSX_SDK))
+ 
+-Configs += asan_iossim_dynamic
++#Configs += asan_iossim_dynamic
+ UniversalArchs.asan_iossim_dynamic := $(call CheckArches,i386 x86_64,asan_iossim_dynamic,$(IOSSIM_SDK))
+ 
+-Configs += ubsan_osx
++#Configs += ubsan_osx
+ UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx,$(OSX_SDK))
+ 
+ # Darwin 10.6 has a bug in cctools that makes it unable to use ranlib on our ARM
 --- a/tools/clang/runtime/compiler-rt/Makefile.orig	2015-01-08 23:42:54.000000000 -0800
 +++ b/tools/clang/runtime/compiler-rt/Makefile	2015-01-10 04:13:59.000000000 -0800
 @@ -78,9 +78,7 @@ ifeq ($(OS),Darwin)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150119/df6fe22f/attachment.html>

More information about the macports-changes mailing list