[131780] trunk/dports/lang
jeremyhu at macports.org
jeremyhu at macports.org
Sun Jan 18 01:41:02 PST 2015
Revision: 131780
https://trac.macports.org/changeset/131780
Author: jeremyhu at macports.org
Date: 2015-01-18 01:41:02 -0800 (Sun, 18 Jan 2015)
Log Message:
-----------
llvm-3.[4567]: Restore a patch to use the correct toolchain when building compiler-rt to deal with issues on Snow Leopard
Modified Paths:
--------------
trunk/dports/lang/llvm-3.4/Portfile
trunk/dports/lang/llvm-3.5/Portfile
trunk/dports/lang/llvm-3.6/Portfile
trunk/dports/lang/llvm-3.7/Portfile
Added Paths:
-----------
trunk/dports/lang/llvm-3.4/files/compiler_rt-toolchain.patch
trunk/dports/lang/llvm-3.5/files/compiler_rt-toolchain.patch
trunk/dports/lang/llvm-3.6/files/compiler_rt-toolchain.patch
trunk/dports/lang/llvm-3.7/files/compiler_rt-toolchain.patch
Modified: trunk/dports/lang/llvm-3.4/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.4/Portfile 2015-01-18 09:07:34 UTC (rev 131779)
+++ trunk/dports/lang/llvm-3.4/Portfile 2015-01-18 09:41:02 UTC (rev 131780)
@@ -131,8 +131,14 @@
3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch \
3004-Fix-missing-long-long-math-prototypes-when-using-the.patch \
3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch \
+ compiler_rt-toolchain.patch \
fix-clang-dylib-ids.patch
+ # 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
+
# Introduces a failure during build (-arch ?? passed to ld), to be investigated:
# 1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch \
Added: trunk/dports/lang/llvm-3.4/files/compiler_rt-toolchain.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/compiler_rt-toolchain.patch (rev 0)
+++ trunk/dports/lang/llvm-3.4/files/compiler_rt-toolchain.patch 2015-01-18 09:41:02 UTC (rev 131780)
@@ -0,0 +1,40 @@
+diff -Naurp llvm-3.4.2.src.orig/projects/compiler-rt/make/platform/clang_darwin.mk llvm-3.4.2.src/projects/compiler-rt/make/platform/clang_darwin.mk
+--- llvm-3.4.2.src.orig/projects/compiler-rt/make/platform/clang_darwin.mk 2015-01-18 01:28:14.000000000 -0800
++++ llvm-3.4.2.src/projects/compiler-rt/make/platform/clang_darwin.mk 2015-01-18 01:34:16.000000000 -0800
+@@ -38,11 +38,11 @@ XCRunSdkPath = \
+ ###
+
+ CC := $(call XCRun,clang)
+-AR := $(call XCRun,ar)
+-RANLIB := $(call XCRun,ranlib)
+-STRIP := $(call XCRun,strip)
+-LIPO := $(call XCRun,lipo)
+-DSYMUTIL := $(call XCRun,dsymutil)
++AR := @@PREFIX@@/bin/ar
++RANLIB := @@PREFIX@@/bin/ranlib
++STRIP := @@PREFIX@@/bin/strip
++LIPO := @@PREFIX@@/bin/lipo
++DSYMUTIL := @@PREFIX@@/bin/dsymutil
+
+ Configs :=
+ UniversalArchs :=
+diff -Naurp llvm-3.4.2.src.orig/projects/compiler-rt/make/platform/clang_darwin_embedded.mk llvm-3.4.2.src/projects/compiler-rt/make/platform/clang_darwin_embedded.mk
+--- llvm-3.4.2.src.orig/projects/compiler-rt/make/platform/clang_darwin_embedded.mk 2013-11-15 15:26:29.000000000 -0800
++++ llvm-3.4.2.src/projects/compiler-rt/make/platform/clang_darwin_embedded.mk 2015-01-18 01:34:33.000000000 -0800
+@@ -15,11 +15,11 @@ XCRun = \
+ ###
+
+ CC := $(call XCRun,clang)
+-AR := $(call XCRun,ar)
+-RANLIB := $(call XCRun,ranlib)
+-STRIP := $(call XCRun,strip)
+-LIPO := $(call XCRun,lipo)
+-DSYMUTIL := $(call XCRun,dsymutil)
++AR := @@PREFIX@@/bin/ar
++RANLIB := @@PREFIX@@/bin/ranlib
++STRIP := @@PREFIX@@/bin/strip
++LIPO := @@PREFIX@@/bin/lipo
++DSYMUTIL := @@PREFIX@@/bin/dsymutil
+
+ Configs :=
+ UniversalArchs :=
Modified: trunk/dports/lang/llvm-3.5/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.5/Portfile 2015-01-18 09:07:34 UTC (rev 131779)
+++ trunk/dports/lang/llvm-3.5/Portfile 2015-01-18 09:41:02 UTC (rev 131780)
@@ -139,8 +139,14 @@
3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch \
3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch \
3004-Fix-missing-long-long-math-prototypes-when-using-the.patch \
- 3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
+ 3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch \
+ compiler_rt-toolchain.patch
+ # 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
+
# Introduces a failure during build (-arch ?? passed to ld), to be investigated:
# 1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch \
Added: trunk/dports/lang/llvm-3.5/files/compiler_rt-toolchain.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/compiler_rt-toolchain.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/compiler_rt-toolchain.patch 2015-01-18 09:41:02 UTC (rev 131780)
@@ -0,0 +1,42 @@
+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
+@@ -53,11 +53,11 @@ XCRunSdkPath = \
+
+ CC := $(call XCRun,clang)
+ LD := $(shell $(CC) -print-prog-name=ld)
+-AR := $(call XCRun,ar)
+-RANLIB := $(call XCRun,ranlib)
+-STRIP := $(call XCRun,strip)
+-LIPO := $(call XCRun,lipo)
+-DSYMUTIL := $(call XCRun,dsymutil)
++AR := @@PREFIX@@/bin/ar
++RANLIB := @@PREFIX@@/bin/ranlib
++STRIP := @@PREFIX@@/bin/strip
++LIPO := @@PREFIX@@/bin/lipo
++DSYMUTIL := @@PREFIX@@/bin/dsymutil
+
+ OSX_SDK := $(call XCRunSdkPath,macosx)
+ IOS_SDK := $(call XCRunSdkPath,iphoneos)
+Index: llvm-3.6svn/projects/compiler-rt/make/platform/clang_macho_embedded.mk
+===================================================================
+--- llvm-3.6svn.orig/projects/compiler-rt/make/platform/clang_macho_embedded.mk
++++ llvm-3.6svn/projects/compiler-rt/make/platform/clang_macho_embedded.mk
+@@ -33,11 +33,11 @@ XCRun = \
+ ###
+
+ CC := $(call XCRun,clang)
+-AR := $(call XCRun,ar)
+-RANLIB := $(call XCRun,ranlib)
+-STRIP := $(call XCRun,strip)
+-LIPO := $(call XCRun,lipo)
+-DSYMUTIL := $(call XCRun,dsymutil)
++AR := @@PREFIX@@/bin/ar
++RANLIB := @@PREFIX@@/bin/ranlib
++STRIP := @@PREFIX@@/bin/strip
++LIPO := @@PREFIX@@/bin/lipo
++DSYMUTIL := @@PREFIX@@/bin/dsymutil
+
+ Configs :=
+ UniversalArchs :=
Modified: trunk/dports/lang/llvm-3.6/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.6/Portfile 2015-01-18 09:07:34 UTC (rev 131779)
+++ trunk/dports/lang/llvm-3.6/Portfile 2015-01-18 09:41:02 UTC (rev 131780)
@@ -117,8 +117,14 @@
3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch \
3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch \
3004-Fix-missing-long-long-math-prototypes-when-using-the.patch \
- 3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
+ 3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch \
+ compiler_rt-toolchain.patch
+ # 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
+
if {![variant_isset arm_runtime]} {
# Alternate fix for #33272.
patchfiles-append disable-arm-runtime.patch
Added: trunk/dports/lang/llvm-3.6/files/compiler_rt-toolchain.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/compiler_rt-toolchain.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/compiler_rt-toolchain.patch 2015-01-18 09:41:02 UTC (rev 131780)
@@ -0,0 +1,42 @@
+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
+@@ -53,11 +53,11 @@ XCRunSdkPath = \
+
+ CC := $(call XCRun,clang)
+ LD := $(shell $(CC) -print-prog-name=ld)
+-AR := $(call XCRun,ar)
+-RANLIB := $(call XCRun,ranlib)
+-STRIP := $(call XCRun,strip)
+-LIPO := $(call XCRun,lipo)
+-DSYMUTIL := $(call XCRun,dsymutil)
++AR := @@PREFIX@@/bin/ar
++RANLIB := @@PREFIX@@/bin/ranlib
++STRIP := @@PREFIX@@/bin/strip
++LIPO := @@PREFIX@@/bin/lipo
++DSYMUTIL := @@PREFIX@@/bin/dsymutil
+
+ OSX_SDK := $(call XCRunSdkPath,macosx)
+ IOS_SDK := $(call XCRunSdkPath,iphoneos)
+Index: llvm-3.6svn/projects/compiler-rt/make/platform/clang_macho_embedded.mk
+===================================================================
+--- llvm-3.6svn.orig/projects/compiler-rt/make/platform/clang_macho_embedded.mk
++++ llvm-3.6svn/projects/compiler-rt/make/platform/clang_macho_embedded.mk
+@@ -33,11 +33,11 @@ XCRun = \
+ ###
+
+ CC := $(call XCRun,clang)
+-AR := $(call XCRun,ar)
+-RANLIB := $(call XCRun,ranlib)
+-STRIP := $(call XCRun,strip)
+-LIPO := $(call XCRun,lipo)
+-DSYMUTIL := $(call XCRun,dsymutil)
++AR := @@PREFIX@@/bin/ar
++RANLIB := @@PREFIX@@/bin/ranlib
++STRIP := @@PREFIX@@/bin/strip
++LIPO := @@PREFIX@@/bin/lipo
++DSYMUTIL := @@PREFIX@@/bin/dsymutil
+
+ Configs :=
+ UniversalArchs :=
Modified: trunk/dports/lang/llvm-3.7/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.7/Portfile 2015-01-18 09:07:34 UTC (rev 131779)
+++ trunk/dports/lang/llvm-3.7/Portfile 2015-01-18 09:41:02 UTC (rev 131780)
@@ -99,8 +99,7 @@
0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch \
0002-MacPorts-Only-Update-install-targets-for-clang-subpo.patch \
0003-MacPorts-Only-Use-full-path-for-the-dylib-id-instead.patch \
- 0004-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch \
- 0005-MacPorts-Only-Skip-checking-for-python-in-configure.patch
+ 0004-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch
if {${subport} eq "clang-${llvm_version}"} {
patchfiles-append \
@@ -118,8 +117,14 @@
3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch \
3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch \
3004-Fix-missing-long-long-math-prototypes-when-using-the.patch \
- 3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch
+ 3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch \
+ compiler_rt-toolchain.patch
+ # 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
+
if {![variant_isset arm_runtime]} {
# Alternate fix for #33272.
patchfiles-append disable-arm-runtime.patch
Added: trunk/dports/lang/llvm-3.7/files/compiler_rt-toolchain.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/compiler_rt-toolchain.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/compiler_rt-toolchain.patch 2015-01-18 09:41:02 UTC (rev 131780)
@@ -0,0 +1,42 @@
+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
+@@ -53,11 +53,11 @@ XCRunSdkPath = \
+
+ CC := $(call XCRun,clang)
+ LD := $(shell $(CC) -print-prog-name=ld)
+-AR := $(call XCRun,ar)
+-RANLIB := $(call XCRun,ranlib)
+-STRIP := $(call XCRun,strip)
+-LIPO := $(call XCRun,lipo)
+-DSYMUTIL := $(call XCRun,dsymutil)
++AR := @@PREFIX@@/bin/ar
++RANLIB := @@PREFIX@@/bin/ranlib
++STRIP := @@PREFIX@@/bin/strip
++LIPO := @@PREFIX@@/bin/lipo
++DSYMUTIL := @@PREFIX@@/bin/dsymutil
+
+ OSX_SDK := $(call XCRunSdkPath,macosx)
+ IOS_SDK := $(call XCRunSdkPath,iphoneos)
+Index: llvm-3.6svn/projects/compiler-rt/make/platform/clang_macho_embedded.mk
+===================================================================
+--- llvm-3.6svn.orig/projects/compiler-rt/make/platform/clang_macho_embedded.mk
++++ llvm-3.6svn/projects/compiler-rt/make/platform/clang_macho_embedded.mk
+@@ -33,11 +33,11 @@ XCRun = \
+ ###
+
+ CC := $(call XCRun,clang)
+-AR := $(call XCRun,ar)
+-RANLIB := $(call XCRun,ranlib)
+-STRIP := $(call XCRun,strip)
+-LIPO := $(call XCRun,lipo)
+-DSYMUTIL := $(call XCRun,dsymutil)
++AR := @@PREFIX@@/bin/ar
++RANLIB := @@PREFIX@@/bin/ranlib
++STRIP := @@PREFIX@@/bin/strip
++LIPO := @@PREFIX@@/bin/lipo
++DSYMUTIL := @@PREFIX@@/bin/dsymutil
+
+ Configs :=
+ UniversalArchs :=
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150118/d86599dd/attachment.html>
More information about the macports-changes
mailing list