Revision: 139779 https://trac.macports.org/changeset/139779 Author: jeremyhu@macports.org Date: 2015-08-26 10:58:19 -0700 (Wed, 26 Aug 2015) Log Message: ----------- llvm-3.6: Bump to version 3.6.2 Modified Paths: -------------- trunk/dports/lang/llvm-3.6/Portfile Added Paths: ----------- trunk/dports/lang/llvm-3.6/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch Modified: trunk/dports/lang/llvm-3.6/Portfile =================================================================== --- trunk/dports/lang/llvm-3.6/Portfile 2015-08-26 17:58:09 UTC (rev 139778) +++ trunk/dports/lang/llvm-3.6/Portfile 2015-08-26 17:58:19 UTC (rev 139779) @@ -76,7 +76,7 @@ #svn.url https://llvm.org/svn/llvm-project/llvm/branches/release_${llvm_version_no_dot} #default_variants-append +assertions -version ${llvm_version}.1 +version ${llvm_version}.2 epoch 1 master_sites http://llvm.org/releases/${version} use_xz yes @@ -94,24 +94,24 @@ } } -checksums llvm-3.6.1.src.tar.xz \ - rmd160 9a66dc3f06078ffede1a190dcca95e071e63feb4 \ - sha256 2f00c615913aa0b56607ee1548936e60ad2aa89e6d56f23fb032a4463366fc7a \ - cfe-3.6.1.src.tar.xz \ - rmd160 2199271489c7a1c63aa41e80ff78089aeebdcd3e \ - sha256 74f92d0c93b86678b015e87655f59474b2f657769680efdeb3c0524ffbd2dad7 \ - compiler-rt-3.6.1.src.tar.xz \ - rmd160 171af614b4656c121a6b8e58ce3e137b0495cd64 \ - sha256 fcbf610c77be6047f11ca10c4725610417beba832565115a9e2fcfe2897b649f \ - libcxx-3.6.1.src.tar.xz \ - rmd160 3da38b89322c0ea4abf42df3823831d8033b764a \ - sha256 5a5c653becf3978d4c4f6095708660855bed691210a9426bb839eecd88b6c0f9 \ - clang-tools-extra-3.6.1.src.tar.xz \ - rmd160 411dda52ca2a7b7aa9cbb7b54dfa5ac5edcf4f98 \ - sha256 f4ee70d870d550a9147ac6a548ce7daf7d9e6897348bf411f43c572966fb92b6 \ - polly-3.6.1.src.tar.xz \ - rmd160 b673db8980ba925b5d98c54303341f804238d0e8 \ - sha256 d085f97bcbb4e47b51ed60ba9a55b3fee394193e7e48ab5c5b0035e6fc80a7eb +checksums llvm-3.6.2.src.tar.xz \ + rmd160 521cbc5fe2925ea3c6e90c7a31f752a04045c972 \ + sha256 f60dc158bfda6822de167e87275848969f0558b3134892ff54fced87e4667b94 \ + cfe-3.6.2.src.tar.xz \ + rmd160 10d913b4d5317f8c2520e5fc6117df30937317a8 \ + sha256 ae9180466a23acb426d12444d866b266ff2289b266064d362462e44f8d4699f3 \ + compiler-rt-3.6.2.src.tar.xz \ + rmd160 9b68a32d49d4bef4603d550934192f39fea42895 \ + sha256 0f2ff37d80a64575fecd8cf0d5c50f7ac1f837ddf700d1855412bb7547431d87 \ + libcxx-3.6.2.src.tar.xz \ + rmd160 42b8832d01d4e6b553babc93cb5dbd4ce2bb1931 \ + sha256 52f3d452f48209c9df1792158fdbd7f3e98ed9bca8ebb51fcd524f67437c8b81 \ + clang-tools-extra-3.6.2.src.tar.xz \ + rmd160 4e56b0d5a8056c3800522efb9cc4d52c94ab2af2 \ + sha256 6a0ec627d398f501ddf347060f7a2ccea4802b2494f1d4fd7bda3e0442d04feb \ + polly-3.6.2.src.tar.xz \ + rmd160 59515632836a37c2790677b5b332868578528e31 \ + sha256 f2a956730b76212f22a1c10f35f195795e4d027ad28c226f97ddb8c0fd16bcbc patch.pre_args -p1 patchfiles \ @@ -136,6 +136,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.6/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch =================================================================== --- trunk/dports/lang/llvm-3.6/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch (rev 0) +++ trunk/dports/lang/llvm-3.6/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch 2015-08-26 17:58:19 UTC (rev 139779) @@ -0,0 +1,53 @@ +From 93765fa740dd35a58fef1ff80ff31f69918a57aa Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia <jeremyhu@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@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 +@@ -93,11 +93,11 @@ UniversalArchs.ios += $(call CheckArches + # 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 +@@ -109,20 +109,20 @@ UniversalArchs.cc_kext_ios5 += $(call Ch + + # 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 +-UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx,$(OSX_SDK)) ++UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64,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