[131781] trunk/dports/lang
jeremyhu at macports.org
jeremyhu at macports.org
Sun Jan 18 01:49:40 PST 2015
Revision: 131781
https://trac.macports.org/changeset/131781
Author: jeremyhu at macports.org
Date: 2015-01-18 01:49:39 -0800 (Sun, 18 Jan 2015)
Log Message:
-----------
llvm-3.[456]: Fix whitespace error
Modified Paths:
--------------
trunk/dports/lang/llvm-3.4/Portfile
trunk/dports/lang/llvm-3.5/Portfile
trunk/dports/lang/llvm-3.5/files/leopard-no-asan.patch
trunk/dports/lang/llvm-3.6/Portfile
trunk/dports/lang/llvm-3.6/files/disable-arm-runtime.patch
trunk/dports/lang/llvm-3.6/files/leopard-no-asan.patch
trunk/dports/lang/llvm-3.7/files/disable-arm-runtime.patch
trunk/dports/lang/llvm-3.7/files/leopard-no-asan.patch
Modified: trunk/dports/lang/llvm-3.4/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.4/Portfile 2015-01-18 09:41:02 UTC (rev 131780)
+++ trunk/dports/lang/llvm-3.4/Portfile 2015-01-18 09:49:39 UTC (rev 131781)
@@ -136,8 +136,8 @@
# I'm not sure if we need to delete this. It seems to build fine with it
# present, but we used to explicitly only use this patch for the llvm subport.
- patchfiles-delete \
- 0005-MacPorts-Only-Skip-checking-for-python-in-configure.patch
+ patchfiles-delete \
+ 0002-MacPorts-Only-Skip-checking-for-python-in-configure.patch
# Introduces a failure during build (-arch ?? passed to ld), to be investigated:
# 1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch \
Modified: trunk/dports/lang/llvm-3.5/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.5/Portfile 2015-01-18 09:41:02 UTC (rev 131780)
+++ trunk/dports/lang/llvm-3.5/Portfile 2015-01-18 09:49:39 UTC (rev 131781)
@@ -144,8 +144,8 @@
# I'm not sure if we need to delete this. It seems to build fine with it
# present, but we used to explicitly only use this patch for the llvm subport.
- patchfiles-delete \
- 0005-MacPorts-Only-Skip-checking-for-python-in-configure.patch
+ patchfiles-delete \
+ 0004-MacPorts-Only-Skip-checking-for-python-in-configure.patch
# Introduces a failure during build (-arch ?? passed to ld), to be investigated:
# 1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch \
Modified: trunk/dports/lang/llvm-3.5/files/leopard-no-asan.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/leopard-no-asan.patch 2015-01-18 09:41:02 UTC (rev 131780)
+++ trunk/dports/lang/llvm-3.5/files/leopard-no-asan.patch 2015-01-18 09:49:39 UTC (rev 131781)
@@ -1,27 +1,22 @@
--- a/projects/compiler-rt/make/platform/clang_darwin.mk.orig 2015-01-10 03:53:30.000000000 -0800
+++ b/projects/compiler-rt/make/platform/clang_darwin.mk 2015-01-10 04:07:11.000000000 -0800
-@@ -96,8 +96,8 @@ Configs += profile_ios
- UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64 x86_64h )
+@@ -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
--UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64 x86_64h,asan_osx_dynamic)
+#Configs += asan_osx_dynamic
-+#UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64 x86_64h,asan_osx_dynamic)
+ UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64 x86_64h,asan_osx_dynamic,$(OSX_SDK))
- IOSSIM_SDK_PATH := $(call XCRunSdkPath,iphonesimulator)
- ifneq ($(IOSSIM_SDK_PATH),)
-@@ -105,8 +105,8 @@ Configs += asan_iossim_dynamic
- UniversalArchs.asan_iossim_dynamic := $(call CheckArches,i386 x86_64 x86_64h,asan_iossim_dynamic)
- endif
+-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
--UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx)
+#Configs += ubsan_osx
-+#UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64 x86_64h,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
- # object files. If we are on that platform, strip out all ARM archs. We still
--- a/tools/clang/runtime/compiler-rt/Makefile.orig 2015-01-10 04:34:06.000000000 -0800
+++ b/tools/clang/runtime/compiler-rt/Makefile 2015-01-10 04:35:55.000000000 -0800
@@ -82,9 +82,7 @@ ifeq ($(OS),Darwin)
Modified: trunk/dports/lang/llvm-3.6/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.6/Portfile 2015-01-18 09:41:02 UTC (rev 131780)
+++ trunk/dports/lang/llvm-3.6/Portfile 2015-01-18 09:49:39 UTC (rev 131781)
@@ -122,7 +122,7 @@
# I'm not sure if we need to delete this. It seems to build fine with it
# present, but we used to explicitly only use this patch for the llvm subport.
- patchfiles-delete \
+ patchfiles-delete \
0005-MacPorts-Only-Skip-checking-for-python-in-configure.patch
if {![variant_isset arm_runtime]} {
Modified: trunk/dports/lang/llvm-3.6/files/disable-arm-runtime.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/disable-arm-runtime.patch 2015-01-18 09:41:02 UTC (rev 131780)
+++ trunk/dports/lang/llvm-3.6/files/disable-arm-runtime.patch 2015-01-18 09:49:39 UTC (rev 131781)
@@ -14,7 +14,7 @@
#UniversalArchs.profile_ios := $(filter-out armv7, $(UniversalArchs.profile_ios))
#endif
-+RC_SUPPORTED_ARCHS := i386 x86_64 x86_64h
++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.
Modified: trunk/dports/lang/llvm-3.6/files/leopard-no-asan.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/leopard-no-asan.patch 2015-01-18 09:41:02 UTC (rev 131780)
+++ trunk/dports/lang/llvm-3.6/files/leopard-no-asan.patch 2015-01-18 09:49:39 UTC (rev 131781)
@@ -1,26 +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
-@@ -114,14 +114,14 @@ UniversalArchs.profile_ios := $(call Che
- UniversalArchs.profile_ios += $(call CheckArches,armv7 arm64,profile_ios,$(IOS_SDK))
+@@ -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
--UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64 x86_64h,asan_osx_dynamic,$(OSX_SDK))
+#Configs += asan_osx_dynamic
-+#UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64 x86_64h,asan_osx_dynamic,$(OSX_SDK))
+ UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64 x86_64h,asan_osx_dynamic,$(OSX_SDK))
-Configs += asan_iossim_dynamic
--UniversalArchs.asan_iossim_dynamic := $(call CheckArches,i386 x86_64,asan_iossim_dynamic,$(IOSSIM_SDK))
+#Configs += asan_iossim_dynamic
-+#UniversalArchs.asan_iossim_dynamic := $(call CheckArches,i386 x86_64,asan_iossim_dynamic,$(IOSSIM_SDK))
+ UniversalArchs.asan_iossim_dynamic := $(call CheckArches,i386 x86_64,asan_iossim_dynamic,$(IOSSIM_SDK))
-Configs += ubsan_osx
--UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx,$(OSX_SDK))
+#Configs += ubsan_osx
-+#UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx,$(OSX_SDK))
+ 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
- # object files. If we are on that platform, strip out all ARM archs. We still
--- 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)
Modified: trunk/dports/lang/llvm-3.7/files/disable-arm-runtime.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/disable-arm-runtime.patch 2015-01-18 09:41:02 UTC (rev 131780)
+++ trunk/dports/lang/llvm-3.7/files/disable-arm-runtime.patch 2015-01-18 09:49:39 UTC (rev 131781)
@@ -14,7 +14,7 @@
#UniversalArchs.profile_ios := $(filter-out armv7, $(UniversalArchs.profile_ios))
#endif
-+RC_SUPPORTED_ARCHS := i386 x86_64 x86_64h
++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.
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-18 09:41:02 UTC (rev 131780)
+++ trunk/dports/lang/llvm-3.7/files/leopard-no-asan.patch 2015-01-18 09:49:39 UTC (rev 131781)
@@ -1,26 +1,3 @@
---- 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
-@@ -114,14 +114,14 @@ UniversalArchs.profile_ios := $(call Che
- UniversalArchs.profile_ios += $(call CheckArches,armv7 arm64,profile_ios,$(IOS_SDK))
-
- # Configurations which define the ASAN support functions.
--Configs += asan_osx_dynamic
--UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64 x86_64h,asan_osx_dynamic,$(OSX_SDK))
-+#Configs += asan_osx_dynamic
-+#UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64 x86_64h,asan_osx_dynamic,$(OSX_SDK))
-
--Configs += asan_iossim_dynamic
--UniversalArchs.asan_iossim_dynamic := $(call CheckArches,i386 x86_64,asan_iossim_dynamic,$(IOSSIM_SDK))
-+#Configs += asan_iossim_dynamic
-+#UniversalArchs.asan_iossim_dynamic := $(call CheckArches,i386 x86_64,asan_iossim_dynamic,$(IOSSIM_SDK))
-
--Configs += ubsan_osx
--UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx,$(OSX_SDK))
-+#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
- # object files. If we are on that platform, strip out all ARM archs. We still
--- 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/20150118/236edd0c/attachment-0001.html>
More information about the macports-changes
mailing list