[131768] trunk/dports/lang

jeremyhu at macports.org jeremyhu at macports.org
Sat Jan 17 21:18:34 PST 2015 

Revision: 131768
          https://trac.macports.org/changeset/131768
Author:   jeremyhu at macports.org
Date:     2015-01-17 21:18:34 -0800 (Sat, 17 Jan 2015)
Log Message:
-----------
llvm-3.[67]: ppc build improvements

Modified Paths:
--------------
    trunk/dports/lang/llvm-3.6/Portfile
    trunk/dports/lang/llvm-3.6/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch
    trunk/dports/lang/llvm-3.6/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
    trunk/dports/lang/llvm-3.6/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch
    trunk/dports/lang/llvm-3.7/Portfile
    trunk/dports/lang/llvm-3.7/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch
    trunk/dports/lang/llvm-3.7/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
    trunk/dports/lang/llvm-3.7/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch

Added Paths:
-----------
    trunk/dports/lang/llvm-3.6/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch
    trunk/dports/lang/llvm-3.7/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch

Modified: trunk/dports/lang/llvm-3.6/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.6/Portfile	2015-01-18 05:07:16 UTC (rev 131767)
+++ trunk/dports/lang/llvm-3.6/Portfile	2015-01-18 05:18:34 UTC (rev 131768)
@@ -112,6 +112,7 @@
         2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch \
         2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch \
         2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch \
+        2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch \
         3001-buildit-build-fix-for-Leopard.patch \
         3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch \
         3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch \

Modified: trunk/dports/lang/llvm-3.6/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch	2015-01-18 05:07:16 UTC (rev 131767)
+++ trunk/dports/lang/llvm-3.6/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch	2015-01-18 05:18:34 UTC (rev 131768)
@@ -1,7 +1,7 @@
-From 2972ffafff4a394f521986b47810324cd1b7e3ba Mon Sep 17 00:00:00 2001
+From 1a76dc937816603c8da46b0a16985f28e3a3b9dd Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Mon, 15 Apr 2013 22:38:18 -0700
-Subject: [PATCH 2001/2003] MacPorts Only: Comment out SL cctools workaround
+Subject: [PATCH 2001/2004] MacPorts Only: Comment out SL cctools workaround
 
 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 ---

Modified: trunk/dports/lang/llvm-3.6/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch	2015-01-18 05:07:16 UTC (rev 131767)
+++ trunk/dports/lang/llvm-3.6/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch	2015-01-18 05:18:34 UTC (rev 131768)
@@ -1,7 +1,7 @@
-From b16ca706de5eeb244b1fe889760ae4339b23a170 Mon Sep 17 00:00:00 2001
+From be3909d280cae05c93c520bfb1e7a8f0ed5a11af Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Sat, 10 Jan 2015 03:34:51 -0800
-Subject: [PATCH 2002/2003] Update CheckArches to fallback on Intel/ppc if ld
+Subject: [PATCH 2002/2004] Update CheckArches to fallback on Intel/ppc if ld
  -v doesn't report supported architectures
 
 Older versions of ld64 (eg: Xcode 3.x) do not report this.

Modified: trunk/dports/lang/llvm-3.6/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch	2015-01-18 05:07:16 UTC (rev 131767)
+++ trunk/dports/lang/llvm-3.6/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch	2015-01-18 05:18:34 UTC (rev 131768)
@@ -1,7 +1,7 @@
-From e1ded9c3e06fb5c97d8936b77ccf8982e52a7b69 Mon Sep 17 00:00:00 2001
+From 9de48c64a81a3cd9bee512fce88b81bcc7b38bb8 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Sat, 17 Jan 2015 17:45:27 -0800
-Subject: [PATCH 2003/2003] Fall back on xcodebuild -sdk when xcrun --sdk is
+Subject: [PATCH 2003/2004] Fall back on xcodebuild -sdk when xcrun --sdk is
  not supported
 
 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>

Added: trunk/dports/lang/llvm-3.6/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch	                        (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch	2015-01-18 05:18:34 UTC (rev 131768)
@@ -0,0 +1,55 @@
+From 1fe76a2b12f4837c49237cdca6803e5f43e00f7c Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 19:55:19 -0800
+Subject: [PATCH 2004/2004] On darwin, build ppc slices of the compiler runtime
+ if requested and supported by the SDK and toolchain
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ make/platform/clang_darwin.mk | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
+index ac8de4a..6936031 100644
+--- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
++++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
+@@ -79,10 +79,10 @@ Configs += eprintf
+ UniversalArchs.eprintf := $(call CheckArches,i386,eprintf,$(OSX_SDK))
+ 
+ # Configuration for targeting 10.4. We need a few functions missing from
+-# libgcc_s.10.4.dylib. We only build x86 slices since clang doesn't really
+-# support targeting PowerPC.
++# libgcc_s.10.4.dylib. We don't build ppc64 slices since clang doesn't really
++# support it..
+ Configs += 10.4
+-UniversalArchs.10.4 := $(call CheckArches,i386 x86_64,10.4,$(OSX_SDK))
++UniversalArchs.10.4 := $(call CheckArches,ppc i386 x86_64,10.4,$(OSX_SDK))
+ 
+ # Configuration for targeting iOS for a couple of functions that didn't
+ # make it into libSystem.
+@@ -93,11 +93,11 @@ UniversalArchs.ios += $(call CheckArches,armv7 arm64,ios,$(IOS_SDK))
+ # Configuration for targeting OSX. These functions may not be in libSystem
+ # so we should provide our own.
+ Configs += osx
+-UniversalArchs.osx := $(call CheckArches,i386 x86_64 x86_64h,osx,$(OSX_SDK))
++UniversalArchs.osx := $(call CheckArches,ppc i386 x86_64 x86_64h,osx,$(OSX_SDK))
+ 
+ # Configuration for use with kernel/kexts.
+ Configs += cc_kext
+-UniversalArchs.cc_kext := $(call CheckArches,i386 x86_64 x86_64h,cc_kext,$(OSX_SDK))
++UniversalArchs.cc_kext := $(call CheckArches,ppc i386 x86_64 x86_64h,cc_kext,$(OSX_SDK))
+ UniversalArchs.cc_kext += $(call CheckArches,armv7 arm64,cc_kext,$(IOS_SDK))
+ 
+ # Configuration for use with kernel/kexts for iOS 5.0 and earlier (which used 
+@@ -109,7 +109,7 @@ UniversalArchs.cc_kext_ios5 += $(call CheckArches,armv7,cc_kext_ios5,$(IOS_SDK))
+ 
+ # Configurations which define the profiling support functions.
+ Configs += profile_osx
+-UniversalArchs.profile_osx := $(call CheckArches,i386 x86_64 x86_64h,profile_osx,$(OSX_SDK))
++UniversalArchs.profile_osx := $(call CheckArches,ppc i386 x86_64 x86_64h,profile_osx,$(OSX_SDK))
+ Configs += profile_ios
+ UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64,profile_ios,$(IOSSIM_SDK))
+ UniversalArchs.profile_ios += $(call CheckArches,armv7 arm64,profile_ios,$(IOS_SDK))
+-- 
+2.2.2
+

Modified: trunk/dports/lang/llvm-3.7/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.7/Portfile	2015-01-18 05:07:16 UTC (rev 131767)
+++ trunk/dports/lang/llvm-3.7/Portfile	2015-01-18 05:18:34 UTC (rev 131768)
@@ -113,6 +113,7 @@
         2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch \
         2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch \
         2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch \
+        2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch \
         3001-buildit-build-fix-for-Leopard.patch \
         3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch \
         3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch \

Modified: trunk/dports/lang/llvm-3.7/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch	2015-01-18 05:07:16 UTC (rev 131767)
+++ trunk/dports/lang/llvm-3.7/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch	2015-01-18 05:18:34 UTC (rev 131768)
@@ -1,7 +1,7 @@
-From 2972ffafff4a394f521986b47810324cd1b7e3ba Mon Sep 17 00:00:00 2001
+From 1a76dc937816603c8da46b0a16985f28e3a3b9dd Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Mon, 15 Apr 2013 22:38:18 -0700
-Subject: [PATCH 2001/2003] MacPorts Only: Comment out SL cctools workaround
+Subject: [PATCH 2001/2004] MacPorts Only: Comment out SL cctools workaround
 
 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 ---

Modified: trunk/dports/lang/llvm-3.7/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch	2015-01-18 05:07:16 UTC (rev 131767)
+++ trunk/dports/lang/llvm-3.7/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch	2015-01-18 05:18:34 UTC (rev 131768)
@@ -1,7 +1,7 @@
-From b16ca706de5eeb244b1fe889760ae4339b23a170 Mon Sep 17 00:00:00 2001
+From be3909d280cae05c93c520bfb1e7a8f0ed5a11af Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Sat, 10 Jan 2015 03:34:51 -0800
-Subject: [PATCH 2002/2003] Update CheckArches to fallback on Intel/ppc if ld
+Subject: [PATCH 2002/2004] Update CheckArches to fallback on Intel/ppc if ld
  -v doesn't report supported architectures
 
 Older versions of ld64 (eg: Xcode 3.x) do not report this.

Modified: trunk/dports/lang/llvm-3.7/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch	2015-01-18 05:07:16 UTC (rev 131767)
+++ trunk/dports/lang/llvm-3.7/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch	2015-01-18 05:18:34 UTC (rev 131768)
@@ -1,7 +1,7 @@
-From e1ded9c3e06fb5c97d8936b77ccf8982e52a7b69 Mon Sep 17 00:00:00 2001
+From 9de48c64a81a3cd9bee512fce88b81bcc7b38bb8 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Sat, 17 Jan 2015 17:45:27 -0800
-Subject: [PATCH 2003/2003] Fall back on xcodebuild -sdk when xcrun --sdk is
+Subject: [PATCH 2003/2004] Fall back on xcodebuild -sdk when xcrun --sdk is
  not supported
 
 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>

Added: trunk/dports/lang/llvm-3.7/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch	                        (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch	2015-01-18 05:18:34 UTC (rev 131768)
@@ -0,0 +1,55 @@
+From 1fe76a2b12f4837c49237cdca6803e5f43e00f7c Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 19:55:19 -0800
+Subject: [PATCH 2004/2004] On darwin, build ppc slices of the compiler runtime
+ if requested and supported by the SDK and toolchain
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ make/platform/clang_darwin.mk | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
+index ac8de4a..6936031 100644
+--- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
++++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
+@@ -79,10 +79,10 @@ Configs += eprintf
+ UniversalArchs.eprintf := $(call CheckArches,i386,eprintf,$(OSX_SDK))
+ 
+ # Configuration for targeting 10.4. We need a few functions missing from
+-# libgcc_s.10.4.dylib. We only build x86 slices since clang doesn't really
+-# support targeting PowerPC.
++# libgcc_s.10.4.dylib. We don't build ppc64 slices since clang doesn't really
++# support it..
+ Configs += 10.4
+-UniversalArchs.10.4 := $(call CheckArches,i386 x86_64,10.4,$(OSX_SDK))
++UniversalArchs.10.4 := $(call CheckArches,ppc i386 x86_64,10.4,$(OSX_SDK))
+ 
+ # Configuration for targeting iOS for a couple of functions that didn't
+ # make it into libSystem.
+@@ -93,11 +93,11 @@ UniversalArchs.ios += $(call CheckArches,armv7 arm64,ios,$(IOS_SDK))
+ # Configuration for targeting OSX. These functions may not be in libSystem
+ # so we should provide our own.
+ Configs += osx
+-UniversalArchs.osx := $(call CheckArches,i386 x86_64 x86_64h,osx,$(OSX_SDK))
++UniversalArchs.osx := $(call CheckArches,ppc i386 x86_64 x86_64h,osx,$(OSX_SDK))
+ 
+ # Configuration for use with kernel/kexts.
+ Configs += cc_kext
+-UniversalArchs.cc_kext := $(call CheckArches,i386 x86_64 x86_64h,cc_kext,$(OSX_SDK))
++UniversalArchs.cc_kext := $(call CheckArches,ppc i386 x86_64 x86_64h,cc_kext,$(OSX_SDK))
+ UniversalArchs.cc_kext += $(call CheckArches,armv7 arm64,cc_kext,$(IOS_SDK))
+ 
+ # Configuration for use with kernel/kexts for iOS 5.0 and earlier (which used 
+@@ -109,7 +109,7 @@ UniversalArchs.cc_kext_ios5 += $(call CheckArches,armv7,cc_kext_ios5,$(IOS_SDK))
+ 
+ # Configurations which define the profiling support functions.
+ Configs += profile_osx
+-UniversalArchs.profile_osx := $(call CheckArches,i386 x86_64 x86_64h,profile_osx,$(OSX_SDK))
++UniversalArchs.profile_osx := $(call CheckArches,ppc i386 x86_64 x86_64h,profile_osx,$(OSX_SDK))
+ Configs += profile_ios
+ UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64,profile_ios,$(IOSSIM_SDK))
+ UniversalArchs.profile_ios += $(call CheckArches,armv7 arm64,profile_ios,$(IOS_SDK))
+-- 
+2.2.2
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150117/0c87f3c9/attachment.html>

More information about the macports-changes mailing list