[139396] trunk/dports/lang/llvm-3.7

jeremyhu at macports.org jeremyhu at macports.org
Sat Aug 15 08:57:25 PDT 2015


Revision: 139396
          https://trac.macports.org/changeset/139396
Author:   jeremyhu at macports.org
Date:     2015-08-15 08:57:25 -0700 (Sat, 15 Aug 2015)
Log Message:
-----------
llvm-3.7: Bump to r245076

Revision Links:
--------------
    https://trac.macports.org/changeset/245076

Modified Paths:
--------------
    trunk/dports/lang/llvm-3.7/Portfile

Added Paths:
-----------
    trunk/dports/lang/llvm-3.7/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch

Modified: trunk/dports/lang/llvm-3.7/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.7/Portfile	2015-08-15 07:20:28 UTC (rev 139395)
+++ trunk/dports/lang/llvm-3.7/Portfile	2015-08-15 15:57:25 UTC (rev 139396)
@@ -7,7 +7,6 @@
 set llvm_version        3.7
 set llvm_version_no_dot 37
 name                    llvm-${llvm_version}
-revision                1
 subport                 clang-${llvm_version} {}
 set suffix              mp-${llvm_version}
 set sub_prefix          ${prefix}/libexec/llvm-${llvm_version}
@@ -64,17 +63,17 @@
 }
 
 fetch.type              svn
-svn.revision            241984
+svn.revision            245076
 
 set compiler_rt_rev     ${svn.revision}
 set libcxx_rev          ${svn.revision}
 set clang-modernize_rev ${svn.revision}
 version                 ${llvm_version}-r${svn.revision}
 revision                0
-worksrcdir              trunk
-svn.url                 https://llvm.org/svn/llvm-project/llvm/trunk
-#worksrcdir              release_${llvm_version_no_dot}
-#svn.url                 https://llvm.org/svn/llvm-project/llvm/branches/release_${llvm_version_no_dot}
+#worksrcdir              trunk
+#svn.url                 https://llvm.org/svn/llvm-project/llvm/trunk
+worksrcdir              release_${llvm_version_no_dot}
+svn.url                 https://llvm.org/svn/llvm-project/llvm/branches/release_${llvm_version_no_dot}
 default_variants-append +assertions
 
 #version                 ${llvm_version}.0
@@ -119,6 +118,7 @@
         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 \
+        2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.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 \

Added: trunk/dports/lang/llvm-3.7/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch	                        (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch	2015-08-15 15:57:25 UTC (rev 139396)
@@ -0,0 +1,56 @@
+From 93765fa740dd35a58fef1ff80ff31f69918a57aa Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Fri, 14 Aug 2015 11:22:31 -0700
+Subject: [PATCH 2005/2005] MacPorts Only: Don't build x86_64h slice of
+ compiler-rt
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ make/platform/clang_darwin.mk | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
+index c39e33c..2b7403a 100644
+--- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
++++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
+@@ -97,11 +97,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,ppc i386 x86_64 x86_64h,osx,$(OSX_SDK))
++UniversalArchs.osx := $(call CheckArches,ppc i386 x86_64,osx,$(OSX_SDK))
+ 
+ # Configuration for use with kernel/kexts.
+ Configs += cc_kext
+-UniversalArchs.cc_kext := $(call CheckArches,ppc i386 x86_64 x86_64h,cc_kext,$(OSX_SDK))
++UniversalArchs.cc_kext := $(call CheckArches,ppc i386 x86_64,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 
+@@ -113,20 +113,20 @@ 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,ppc i386 x86_64 x86_64h,profile_osx,$(OSX_SDK))
++UniversalArchs.profile_osx := $(call CheckArches,ppc i386 x86_64,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))
+ 
+ # 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))
++UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64,asan_osx_dynamic,$(OSX_SDK))
+ 
+ Configs += asan_iossim_dynamic
+ UniversalArchs.asan_iossim_dynamic := $(call CheckArches,i386 x86_64,asan_iossim_dynamic,$(IOSSIM_SDK))
+ 
+ Configs += ubsan_osx_dynamic
+-UniversalArchs.ubsan_osx_dynamic := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx_dynamic,$(OSX_SDK))
++UniversalArchs.ubsan_osx_dynamic := $(call CheckArches,i386 x86_64,ubsan_osx_dynamic,$(OSX_SDK))
+ 
+ Configs += ubsan_iossim_dynamic
+ UniversalArchs.ubsan_iossim_dynamic := $(call CheckArches,i386 x86_64,ubsan_iossim_dynamic,$(IOSSIM_SDK))
+-- 
+2.5.0
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150815/c0d38df4/attachment-0001.html>


More information about the macports-changes mailing list