[107451] trunk/dports/lang
jeremyhu at macports.org
jeremyhu at macports.org
Sat Jun 29 11:26:14 PDT 2013
Revision: 107451
https://trac.macports.org/changeset/107451
Author: jeremyhu at macports.org
Date: 2013-06-29 11:26:14 -0700 (Sat, 29 Jun 2013)
Log Message:
-----------
{clang,dragonegg,llvm}-3.3: Bump to final release version (#39520)
Modified Paths:
--------------
trunk/dports/lang/dragonegg-3.3/Portfile
trunk/dports/lang/llvm-3.3/Portfile
trunk/dports/lang/llvm-3.3/files/0001-Comment-out-SL-cctools-workaround.patch
Modified: trunk/dports/lang/dragonegg-3.3/Portfile
===================================================================
--- trunk/dports/lang/dragonegg-3.3/Portfile 2013-06-29 18:22:19 UTC (rev 107450)
+++ trunk/dports/lang/dragonegg-3.3/Portfile 2013-06-29 18:26:14 UTC (rev 107451)
@@ -28,22 +28,22 @@
# We build +universal just fine in order to support whatever arch gcc is
depends_skip_archcheck-append gcc${gcc_version}
-fetch.type svn
-svn.revision 180025
-version ${llvm_version}-r${svn.revision}
-worksrcdir trunk
-svn.url http://llvm.org/svn/llvm-project/dragonegg/trunk
+#fetch.type svn
+#svn.revision 180025
+#version ${llvm_version}-r${svn.revision}
+#worksrcdir trunk
+#svn.url http://llvm.org/svn/llvm-project/dragonegg/trunk
#worksrcdir release_33
#svn.url http://llvm.org/svn/llvm-project/dragonegg/branches/release_33
-#version ${llvm_version}
-#epoch 1
-#master_sites http://llvm.org/releases/${version}/
-#extract.suffix .tar.gz
-#distname dragonegg-${version}.src
-#checksums sha1 9be8f055df814e56ea3585156da8c7e457f2cd7b \
-# rmd160 93aa8a463b6b5e1fb9cc1ee0a7c4d310a78ea64f \
-# sha256 72df1fd2e901b254ab8d1b5e7b93c7104751a613aca531f1483f9a637a5f6827
+version ${llvm_version}
+epoch 1
+master_sites http://llvm.org/releases/${version}/
+extract.suffix .tar.gz
+distname dragonegg-${version}.src
+checksums sha1 aaab9d4c33e4bcad82027acb220453b5db61292a \
+ rmd160 afee1287634ca3c926e5cdb93286e3f926f3f9ec \
+ sha256 3153a827e9a3cef4212d0240ffc5ab7a2ce92dcf1283520d1eb0c3f295f4d9cd
pre-fetch {
ui_msg "Please remember to keep dragonegg and llvm in phase by updating llvm-${llvm_version} first."
Modified: trunk/dports/lang/llvm-3.3/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.3/Portfile 2013-06-29 18:22:19 UTC (rev 107450)
+++ trunk/dports/lang/llvm-3.3/Portfile 2013-06-29 18:26:14 UTC (rev 107451)
@@ -48,27 +48,38 @@
default_variants +analyzer
}
-fetch.type svn
-svn.revision 180025
+#fetch.type svn
+#svn.revision 180025
-set compiler_rt_rev ${svn.revision}
-set libcxx_rev ${svn.revision}
-version ${llvm_version}-r${svn.revision}
-worksrcdir trunk
-svn.url http://llvm.org/svn/llvm-project/llvm/trunk
+#set compiler_rt_rev ${svn.revision}
+#set libcxx_rev ${svn.revision}
+#version ${llvm_version}-r${svn.revision}
+#worksrcdir trunk
+#svn.url http://llvm.org/svn/llvm-project/llvm/trunk
#worksrcdir release_33
#svn.url http://llvm.org/svn/llvm-project/llvm/branches/release_33
-default_variants-append +assertions
+#default_variants-append +assertions
-#version ${llvm_version}
-#set compiler_rt_rev 150641
-#set libcxx_rev ${compiler_rt_rev}
-#epoch 1
-#master_sites http://llvm.org/releases/${version}
-#extract.suffix .tar.gz
-#distfiles llvm-${version}.src${extract.suffix}
-#worksrcdir llvm-${version}.src
+version ${llvm_version}
+epoch 1
+master_sites http://llvm.org/releases/${version}
+extract.suffix .tar.gz
+distfiles llvm-${version}.src${extract.suffix}
+worksrcdir llvm-${version}.src
+checksums llvm-3.3.src.tar.gz \
+ rmd160 22878ad746c50b02a7ac8713dd6f8c95c7af4220 \
+ sha256 68766b1e70d05a25e2f502e997a3cb3937187a3296595cf6e0977d5cd6727578 \
+ cfe-3.3.src.tar.gz \
+ rmd160 ff5d684c83b0c1aa36595dcb457da80b58eaf58f \
+ sha256 b1b55de4ab3a57d3e0331a83e0284610191c77d924e3446498d9113d08dfb996 \
+ compiler-rt-3.3.src.tar.gz \
+ rmd160 943675fe098d1fc197d381f55ad9a72681652d09 \
+ sha256 0e2f3180d6316e6c43f064fdd406c5c6515e682c5f31c57c28335b68c7525423 \
+ libcxx-3.3.src.tar.gz \
+ rmd160 b97ba28e87d30dfe5b4f540ce20a190ac0bcab9c \
+ sha256 c403ed18d2992719c794cdd760dc87a948b62a7c2a07beb39eb984dfeb1679f1
+
patchfiles install_target.patch \
tiger.patch \
tiger-shlib.patch
@@ -77,7 +88,7 @@
if {${subport} == "clang-${llvm_version}"} {
if {${distfiles} != ""} {
- distfiles-append clang-${version}.src${extract.suffix} compiler-rt-${version}.src${extract.suffix}
+ distfiles-append cfe-${version}.src${extract.suffix} compiler-rt-${version}.src${extract.suffix} libcxx-${version}.src${extract.suffix}
}
patchfiles-append tiger-shlib-clang.patch tiger-libclang.patch scan-build-PR-35006.patch \
@@ -183,17 +194,17 @@
post-extract {
if {${subport} == "clang-${llvm_version}"} {
- system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/cfe/trunk clang"
+ #system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/cfe/trunk clang"
#system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/cfe/branches/release_33 clang"
- #file rename ${workpath}/clang-${llvm_version}.src ${worksrcpath}/tools/clang
+ file rename ${workpath}/cfe-${llvm_version}.src ${worksrcpath}/tools/clang
- system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/trunk compiler-rt"
+ #system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/trunk compiler-rt"
#system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/branches/release_33 compiler-rt"
- #file rename ${workpath}/compiler-rt-${llvm_version}.src ${worksrcpath}/projects/compiler-rt
+ file rename ${workpath}/compiler-rt-${llvm_version}.src ${worksrcpath}/projects/compiler-rt
- system "cd ${worksrcpath}/projects && svn co -r ${libcxx_rev} http://llvm.org/svn/llvm-project/libcxx/trunk libcxx"
+ #system "cd ${worksrcpath}/projects && svn co -r ${libcxx_rev} http://llvm.org/svn/llvm-project/libcxx/trunk libcxx"
#system "cd ${worksrcpath}/projects && svn co -r ${libcxx_rev} http://llvm.org/svn/llvm-project/libcxx/branches/release_33 libcxx"
- #file rename ${workpath}/libcxx-${llvm_version}.src ${worksrcpath}/projects/libcxx
+ file rename ${workpath}/libcxx-${llvm_version}.src ${worksrcpath}/projects/libcxx
}
}
Modified: trunk/dports/lang/llvm-3.3/files/0001-Comment-out-SL-cctools-workaround.patch
===================================================================
--- trunk/dports/lang/llvm-3.3/files/0001-Comment-out-SL-cctools-workaround.patch 2013-06-29 18:22:19 UTC (rev 107450)
+++ trunk/dports/lang/llvm-3.3/files/0001-Comment-out-SL-cctools-workaround.patch 2013-06-29 18:26:14 UTC (rev 107451)
@@ -12,26 +12,22 @@
index a5e22e6..6a4e956 100644
--- a/projects/compiler-rt/make/platform/clang_darwin.mk
+++ a/projects/compiler-rt/make/platform/clang_darwin.mk
-@@ -83,14 +83,14 @@ UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64,ubsan_osx)
+@@ -83,12 +83,12 @@ UniversalArchs.ubsan_osx := $(call Check
# 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 which sw_vers),)
--ifneq ($(shell sw_vers -productVersion | grep 10.6),)
+-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.profile_ios := $(filter-out armv7, $(UniversalArchs.profile_ios))
-endif
--endif
-+#ifneq ($(shell which sw_vers),)
-+#ifneq ($(shell sw_vers -productVersion | grep 10.6),)
++#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.profile_ios := $(filter-out armv7, $(UniversalArchs.profile_ios))
+#endif
-+#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.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130629/3e0eda46/attachment.html>
More information about the macports-changes
mailing list