[141130] trunk/dports/lang/llvm-3.8

jeremyhu at macports.org jeremyhu at macports.org
Sun Oct 11 08:45:46 PDT 2015 

Revision: 141130
          https://trac.macports.org/changeset/141130
Author:   jeremyhu at macports.org
Date:     2015-10-11 08:45:45 -0700 (Sun, 11 Oct 2015)
Log Message:
-----------
llvm-3.8: Bump to r249357

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

Modified Paths:
--------------
    trunk/dports/lang/llvm-3.8/Portfile
    trunk/dports/lang/llvm-3.8/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch
    trunk/dports/lang/llvm-3.8/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
    trunk/dports/lang/llvm-3.8/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch
    trunk/dports/lang/llvm-3.8/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch
    trunk/dports/lang/llvm-3.8/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch

Modified: trunk/dports/lang/llvm-3.8/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.8/Portfile	2015-10-11 15:15:07 UTC (rev 141129)
+++ trunk/dports/lang/llvm-3.8/Portfile	2015-10-11 15:45:45 UTC (rev 141130)
@@ -64,7 +64,7 @@
 }
 
 fetch.type              svn
-svn.revision            247142
+svn.revision            249357
 
 set compiler_rt_rev     ${svn.revision}
 set libcxx_rev          ${svn.revision}

Modified: trunk/dports/lang/llvm-3.8/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch	2015-10-11 15:15:07 UTC (rev 141129)
+++ trunk/dports/lang/llvm-3.8/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch	2015-10-11 15:45:45 UTC (rev 141130)
@@ -1,36 +1,35 @@
-From e790eed40a8626cc4f87105211eb1825e8054dd2 Mon Sep 17 00:00:00 2001
+From 302e62e629181a4b6c468245f5d2711e7953b1f9 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/2005] MacPorts Only: Comment out SL cctools workaround
 
 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit 1029c2e458e233b7818453d757245f99b19032b8)
 ---
- make/platform/clang_darwin.mk | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
+ 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 79925bc..4e869d6 100644
---- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
-+++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
-@@ -129,12 +129,12 @@ UniversalArchs.ubsan_iossim_dynamic := $(call CheckArches,i386 x86_64,ubsan_ioss
+diff --git llvm_248522-branch/projects/compiler-rt/make/platform/clang_darwin.mk macports_248522-branch/projects/compiler-rt/make/platform/clang_darwin.mk
+index edea93f..eba1d76 100644
+--- llvm_248522-branch/projects/compiler-rt/make/platform/clang_darwin.mk
++++ macports_248522-branch/projects/compiler-rt/make/platform/clang_darwin.mk
+@@ -125,11 +125,11 @@ UniversalArchs.ubsan_iossim_dynamic := $(call CheckArches,i386 x86_64,ubsan_ioss
  # object files. If we are on that platform, strip out all ARM archs. We still
  # build the libraries themselves so that Clang can find them where it expects
  # them, even though they might not have an expected slice.
 -ifneq ($(shell test -x /usr/bin/sw_vers && sw_vers -productVersion | grep 10.6),)
 -UniversalArchs.ios := $(filter-out armv7, $(UniversalArchs.ios))
--UniversalArchs.cc_kext := $(filter-out armv7, $(UniversalArchs.cc_kext))
--UniversalArchs.cc_kext_ios5 := $(filter-out armv7, $(UniversalArchs.cc_kext_ios5))
+-UniversalArchs.cc_kext_ios := $(filter-out armv7, $(UniversalArchs.cc_kext_ios))
 -UniversalArchs.profile_ios := $(filter-out armv7, $(UniversalArchs.profile_ios))
 -endif
 +#ifneq ($(shell test -x /usr/bin/sw_vers && sw_vers -productVersion | grep 10.6),)
 +#UniversalArchs.ios := $(filter-out armv7, $(UniversalArchs.ios))
-+#UniversalArchs.cc_kext := $(filter-out armv7, $(UniversalArchs.cc_kext))
-+#UniversalArchs.cc_kext_ios5 := $(filter-out armv7, $(UniversalArchs.cc_kext_ios5))
++#UniversalArchs.cc_kext_ios := $(filter-out armv7, $(UniversalArchs.cc_kext_ios))
 +#UniversalArchs.profile_ios := $(filter-out armv7, $(UniversalArchs.profile_ios))
 +#endif
  
  # 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.
 -- 
-2.5.0
+2.6.1
 

Modified: trunk/dports/lang/llvm-3.8/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch	2015-10-11 15:15:07 UTC (rev 141129)
+++ trunk/dports/lang/llvm-3.8/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch	2015-10-11 15:45:45 UTC (rev 141130)
@@ -1,4 +1,4 @@
-From 2cf4db0734727b3419532b1a1028d87322c2823b Mon Sep 17 00:00:00 2001
+From b31abf7c99328a79975b360519aca6de0764d6a9 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/2005] Update CheckArches to fallback on Intel/ppc if ld
@@ -9,14 +9,15 @@
 http://www.llvm.org/bugs/show_bug.cgi?id=22182
 
 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit e9dbcc3e88810caf3e303e3f1b106574bb68b8d3)
 ---
  make/platform/clang_darwin.mk | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
-index 4e869d6..1893ad4 100644
---- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
-+++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
+diff --git llvm_248522-branch/projects/compiler-rt/make/platform/clang_darwin.mk macports_248522-branch/projects/compiler-rt/make/platform/clang_darwin.mk
+index eba1d76..2bab6c8 100644
+--- llvm_248522-branch/projects/compiler-rt/make/platform/clang_darwin.mk
++++ macports_248522-branch/projects/compiler-rt/make/platform/clang_darwin.mk
 @@ -25,6 +25,8 @@ CheckArches = \
            if $(LD) -v 2>&1 | grep "configured to support" \
               | tr ' ' '\n' | grep "^$$arch$$" >/dev/null 2>/dev/null; then \
@@ -27,5 +28,5 @@
              printf 1>&2 \
              "warning: clang_darwin.mk: dropping arch '$$arch' from lib '$(2)'";\
 -- 
-2.5.0
+2.6.1
 

Modified: trunk/dports/lang/llvm-3.8/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch	2015-10-11 15:15:07 UTC (rev 141129)
+++ trunk/dports/lang/llvm-3.8/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch	2015-10-11 15:45:45 UTC (rev 141130)
@@ -1,18 +1,19 @@
-From 7a7a0a9a57a221c5f3952339b969ab327eeb06b9 Mon Sep 17 00:00:00 2001
+From 09da66c99a6be81c5701faae03324f7f9b335d3c 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/2005] Fall back on xcodebuild -sdk when xcrun --sdk is
  not supported
 
 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit 4dc615877d820549a0df45b1ba8bd5067fac7a85)
 ---
  make/platform/clang_darwin.mk | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
-index 1893ad4..974ae1c 100644
---- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
-+++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
+diff --git llvm_248522-branch/projects/compiler-rt/make/platform/clang_darwin.mk macports_248522-branch/projects/compiler-rt/make/platform/clang_darwin.mk
+index 2bab6c8..e5a81b0 100644
+--- llvm_248522-branch/projects/compiler-rt/make/platform/clang_darwin.mk
++++ macports_248522-branch/projects/compiler-rt/make/platform/clang_darwin.mk
 @@ -52,6 +52,10 @@ XCRunSdkPath = \
      result=`xcrun --sdk $(1).internal --show-sdk-path 2> /dev/null`; \
      if [ "$$?" != "0" ]; then \
@@ -25,5 +26,5 @@
      fi; \
      echo $$result)
 -- 
-2.5.0
+2.6.1
 

Modified: trunk/dports/lang/llvm-3.8/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch	2015-10-11 15:15:07 UTC (rev 141129)
+++ trunk/dports/lang/llvm-3.8/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch	2015-10-11 15:45:45 UTC (rev 141130)
@@ -1,18 +1,19 @@
-From fd5c602cc9ab63023cf29cc9aeb36e7673e456b2 Mon Sep 17 00:00:00 2001
+From 49d82edeac0ac4ef4f6d78908911cac925b423ec 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/2005] 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>
+(cherry picked from commit 3d46c40327fb50e58d366b4920fc73811ea67c21)
 ---
  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 974ae1c..c39e33c 100644
---- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
-+++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
+diff --git llvm_248522-branch/projects/compiler-rt/make/platform/clang_darwin.mk macports_248522-branch/projects/compiler-rt/make/platform/clang_darwin.mk
+index e5a81b0..1939dab 100644
+--- llvm_248522-branch/projects/compiler-rt/make/platform/clang_darwin.mk
++++ macports_248522-branch/projects/compiler-rt/make/platform/clang_darwin.mk
 @@ -83,10 +83,10 @@ Configs += eprintf
  UniversalArchs.eprintf := $(call CheckArches,i386,eprintf,$(OSX_SDK))
  
@@ -38,10 +39,10 @@
  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 
-@@ -113,7 +113,7 @@ UniversalArchs.cc_kext_ios5 += $(call CheckArches,armv7,cc_kext_ios5,$(IOS_SDK))
+ # Configuration for use with iOS kernel/kexts
+ Configs += cc_kext_ios
+@@ -109,7 +109,7 @@ UniversalArchs.cc_kext_ios += $(call CheckArches,armv7,cc_kext_ios,$(IOS_SDK))
  
  # Configurations which define the profiling support functions.
  Configs += profile_osx
@@ -51,5 +52,5 @@
  UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64,profile_ios,$(IOSSIM_SDK))
  UniversalArchs.profile_ios += $(call CheckArches,armv7 arm64,profile_ios,$(IOS_SDK))
 -- 
-2.5.0
+2.6.1
 

Modified: trunk/dports/lang/llvm-3.8/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch	2015-10-11 15:15:07 UTC (rev 141129)
+++ trunk/dports/lang/llvm-3.8/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch	2015-10-11 15:45:45 UTC (rev 141130)
@@ -1,18 +1,19 @@
-From 93765fa740dd35a58fef1ff80ff31f69918a57aa Mon Sep 17 00:00:00 2001
+From 21fc1fd2a27891a90219a8c85ea8888449bcbed1 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Fri, 14 Aug 2015 11:22:31 -0700
+Date: Wed, 14 Jan 2015 19:55:19 -0800
 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>
+(cherry picked from commit 51d0af047b872208032de38754c5b7944c20ba0e)
 ---
  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
+diff --git llvm_248522-branch/projects/compiler-rt/make/platform/clang_darwin.mk macports_248522-branch/projects/compiler-rt/make/platform/clang_darwin.mk
+index 1939dab..cfe7b7b 100644
+--- llvm_248522-branch/projects/compiler-rt/make/platform/clang_darwin.mk
++++ macports_248522-branch/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.
@@ -24,10 +25,10 @@
  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))
+ # Configuration for use with iOS kernel/kexts
+ Configs += cc_kext_ios
+@@ -109,20 +109,20 @@ UniversalArchs.cc_kext_ios += $(call CheckArches,armv7,cc_kext_ios,$(IOS_SDK))
  
  # Configurations which define the profiling support functions.
  Configs += profile_osx
@@ -52,5 +53,5 @@
  Configs += ubsan_iossim_dynamic
  UniversalArchs.ubsan_iossim_dynamic := $(call CheckArches,i386 x86_64,ubsan_iossim_dynamic,$(IOSSIM_SDK))
 -- 
-2.5.0
+2.6.1
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151011/ea4a05a7/attachment-0001.html>

More information about the macports-changes mailing list