[121509] trunk/dports/lang/llvm-3.4/Portfile

[jeremyhu at macports.org]

Revision: 121509
          https://trac.macports.org/changeset/121509
Author:   jeremyhu at macports.org
Date:     2014-06-27 15:44:49 -0700 (Fri, 27 Jun 2014)
Log Message:
-----------
{clang,llvm}-3.4: Bump to 3.4.2 (#44156)

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

Modified: trunk/dports/lang/llvm-3.4/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.4/Portfile	2014-06-27 21:55:18 UTC (rev 121508)
+++ trunk/dports/lang/llvm-3.4/Portfile	2014-06-27 22:44:49 UTC (rev 121509)
@@ -5,9 +5,8 @@
 
 set llvm_version        3.4
 set llvm_version_no_dot 34
-revision                3
 name                    llvm-${llvm_version}
-subport                 clang-${llvm_version} { revision 4 }
+subport                 clang-${llvm_version} {}
 set suffix              mp-${llvm_version}
 set sub_prefix          ${prefix}/libexec/llvm-${llvm_version}
 dist_subdir             llvm
@@ -64,38 +63,38 @@
 #svn.url                 http://llvm.org/svn/llvm-project/llvm/branches/release_${llvm_version_no_dot}
 #default_variants-append +assertions
 
-version                 ${llvm_version}
+version                 ${llvm_version}.2
 epoch                   1
 master_sites            http://llvm.org/releases/${version}
 extract.suffix          .tar.gz
 distfiles               llvm-${version}.src${extract.suffix}
-worksrcdir              llvm-${version}
+worksrcdir              llvm-${version}.src
 
 if {${distfiles} != ""} {
     if {${subport} == "llvm-${llvm_version}"} {
         if {[variant_isset polly]} {
-            distfiles-append     polly-${version}.src${extract.suffix}
+            distfiles-append     polly-${llvm_version}.src${extract.suffix}
         }
     } elseif {${subport} == "clang-${llvm_version}"} {
-        distfiles-append     clang-${version}.src${extract.suffix} compiler-rt-${version}.src${extract.suffix} libcxx-${version}.src${extract.suffix} clang-tools-extra-${version}.src${extract.suffix}
+        distfiles-append     cfe-${version}.src${extract.suffix} compiler-rt-${llvm_version}.src${extract.suffix} libcxx-${version}.src${extract.suffix} clang-tools-extra-${llvm_version}.src${extract.suffix}
     }
 }
 
-checksums           llvm-3.4.src.tar.gz \
-                    rmd160  67e3f7baa679ca95d944b9cc3528d1ffbe3cdee0 \
-                    sha256  25a5612d692c48481b9b397e2b55f4870e447966d66c96d655241702d44a2628 \
+checksums           llvm-3.4.2.src.tar.gz \
+                    rmd160  5fab44850977afccee34b21c6d339bc8dea21fce \
+                    sha256  17038d47069ad0700c063caed76f0c7259628b0e79651ce2b540d506f2f1efd7 \
                     polly-3.4.src.tar.gz \
                     rmd160  995dc606934494344e2bdc20c1d1f49bf0cedd3c \
                     sha256  9f1a5fb73dddc0afe47a0f4108dea818e0d1d16485899141957f87f75fa50ee7 \
-                    clang-3.4.src.tar.gz \
-                    rmd160  4fbd7e735edc96e224a82ebe2277c69efc488e6b \
-                    sha256  22a9780db3b85a7f2eb9ea1f7f6e00da0249e3d12851e8dea0f62f1783242b1b \
+                    cfe-3.4.2.src.tar.gz \
+                    rmd160  f6b177408f5f9d3a453d41f1f60534f8e1e2845b \
+                    sha256  5ba6f5772f8d00f445209356a7daf83c5bca2da5acd10de517ad2359ae95bc10 \
                     compiler-rt-3.4.src.tar.gz \
                     rmd160  530225a44fa743f80df759e5354a0854eb422306 \
                     sha256  f37c89b1383ce462d47537a0245ac798600887a9be9f63073e16b79ed536ab5c \
-                    libcxx-3.4.src.tar.gz \
-                    rmd160  146a49dc0ae9635f87b13038d36ad816b7245666 \
-                    sha256  bd9f200279f0eb19fc28ed2d9d607dfd38e2e7d92bf52e7fb2161f89212e0deb \
+                    libcxx-3.4.2.src.tar.gz \
+                    rmd160  7984caf2d055ea967544107ae1f948c77556d764 \
+                    sha256  826543ee2feb5d3313b0705145255ebb2ed8d52eace878279c2525ccde6e727c \
                     clang-tools-extra-3.4.src.tar.gz \
                     rmd160  8af0af0ead94bd50b1e6cbdcde5c4770bba5de0d \
                     sha256  ba85187551ae97fe1c8ab569903beae5ff0900e21233e5eb5389f6ceab1028b4
@@ -228,9 +227,9 @@
             system "cd ${worksrcpath}/projects && svn co -r ${libcxx_rev} http://llvm.org/svn/llvm-project/libcxx/branches/release_${llvm_version_no_dot} libcxx"
             system "cd ${worksrcpath}/tools/clang/tools && svn co -r ${clang-modernize_rev} http://llvm.org/svn/llvm-project/clang-tools-extra/branches/release_${llvm_version_no_dot} extra"
         } else {
-            file rename ${workpath}/clang-${llvm_version} ${worksrcpath}/tools/clang
+            file rename ${workpath}/cfe-${version}.src ${worksrcpath}/tools/clang
             file rename ${workpath}/compiler-rt-${llvm_version} ${worksrcpath}/projects/compiler-rt
-            file rename ${workpath}/libcxx-${llvm_version} ${worksrcpath}/projects/libcxx
+            file rename ${workpath}/libcxx-${version}.src ${worksrcpath}/projects/libcxx
             file rename ${workpath}/clang-tools-extra-${llvm_version} ${worksrcpath}/tools/clang/tools/extra
         }
     }
@@ -298,6 +297,11 @@
         system "install_name_tool -change @rpath/libLLVM-${llvm_version}svn.dylib ${sub_prefix}/lib/libLLVM-${llvm_version}svn.dylib ${destroot}${sub_prefix}/lib/libclang.dylib"
         system "install_name_tool -change @rpath/libLLVM-${llvm_version}.dylib ${sub_prefix}/lib/libLLVM-${llvm_version}.dylib ${destroot}${sub_prefix}/lib/libclang.dylib"
 
+        if {${version} != ${llvm_version}} {
+            file rename ${destroot}${sub_prefix}/lib/clang/${version} ${destroot}${sub_prefix}/lib/clang/${llvm_version}
+            ln -s ${llvm_version} ${destroot}${sub_prefix}/lib/clang/${version}
+        }
+
         if {${os.major} > 9} {
             # http://trac.macports.org/ticket/38527
             system "install_name_tool -id ${sub_prefix}/lib/clang/${llvm_version}/lib/darwin/libclang_rt.asan_osx_dynamic.dylib ${destroot}${sub_prefix}/lib/clang/${llvm_version}/lib/darwin/libclang_rt.asan_osx_dynamic.dylib"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140627/3748bb94/attachment.html>