[115645] trunk/dports/lang

jeremyhu at macports.org jeremyhu at macports.org
Tue Jan 7 12:21:12 PST 2014


Revision: 115645
          https://trac.macports.org/changeset/115645
Author:   jeremyhu at macports.org
Date:     2014-01-07 12:21:11 -0800 (Tue, 07 Jan 2014)
Log Message:
-----------
llvm-3.4: Use release tarballs.  Minor updates to llvm-3.5 to match

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

Modified: trunk/dports/lang/dragonegg-3.4/Portfile
===================================================================
--- trunk/dports/lang/dragonegg-3.4/Portfile	2014-01-07 19:50:17 UTC (rev 115644)
+++ trunk/dports/lang/dragonegg-3.4/Portfile	2014-01-07 20:21:11 UTC (rev 115645)
@@ -71,22 +71,23 @@
 # We build +universal just fine in order to support whatever arch gcc is
 depends_skip_archcheck-append gcc${gcc_version_no_dot}
 
-fetch.type              svn
-svn.revision            198151
-version                 ${llvm_version}-r${svn.revision}
+#fetch.type              svn
+#svn.revision            198151
+#version                 ${llvm_version}-r${svn.revision}
 #worksrcdir              trunk
 #svn.url                 http://llvm.org/svn/llvm-project/dragonegg/trunk
-worksrcdir              release_${llvm_version_no_dot}
-svn.url                 http://llvm.org/svn/llvm-project/dragonegg/branches/release_${llvm_version_no_dot}
+#worksrcdir              release_${llvm_version_no_dot}
+#svn.url                 http://llvm.org/svn/llvm-project/dragonegg/branches/release_${llvm_version_no_dot}
 
-#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
+version                 ${llvm_version}
+epoch                   1
+master_sites            http://llvm.org/releases/${version}/
+extract.suffix          .tar.gz
+distname                dragonegg-${version}.src
+worksrcdir              dragonegg-${version}
+checksums           sha1    afd845f591dc00dc058a3f901df6489e9b41102f \
+                    rmd160  0b4ef9f855eb2739ee619da0dac150b904a0be3a \
+                    sha256  34bf35c7d5f395fdc1e2a6b8ddbd83fc2e5027a895333efbe03cf8b5d767639c
 
 pre-fetch {
     ui_msg "Please remember to keep dragonegg and llvm in phase by updating llvm-${llvm_version} first."

Modified: trunk/dports/lang/dragonegg-3.5/Portfile
===================================================================
--- trunk/dports/lang/dragonegg-3.5/Portfile	2014-01-07 19:50:17 UTC (rev 115644)
+++ trunk/dports/lang/dragonegg-3.5/Portfile	2014-01-07 20:21:11 UTC (rev 115645)
@@ -84,6 +84,7 @@
 #master_sites            http://llvm.org/releases/${version}/
 #extract.suffix          .tar.gz
 #distname                dragonegg-${version}.src
+#worksrcdir              dragonegg-${version}
 #checksums           sha1    aaab9d4c33e4bcad82027acb220453b5db61292a \
 #                    rmd160  afee1287634ca3c926e5cdb93286e3f926f3f9ec \
 #                    sha256  3153a827e9a3cef4212d0240ffc5ab7a2ce92dcf1283520d1eb0c3f295f4d9cd

Modified: trunk/dports/lang/llvm-3.4/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.4/Portfile	2014-01-07 19:50:17 UTC (rev 115644)
+++ trunk/dports/lang/llvm-3.4/Portfile	2014-01-07 20:21:11 UTC (rev 115645)
@@ -49,36 +49,58 @@
     default_variants    +analyzer
 }
 
-fetch.type              svn
-svn.revision            198150
-
-set compiler_rt_rev     ${svn.revision}
-set libcxx_rev          ${svn.revision}
-version                 ${llvm_version}-r${svn.revision}
-revision                0
+#fetch.type              svn
+#svn.revision            198150
+#
+#set compiler_rt_rev     ${svn.revision}
+#set libcxx_rev          ${svn.revision}
+#version                 ${llvm_version}-r${svn.revision}
+#revision                0
 #worksrcdir              trunk
 #svn.url                 http://llvm.org/svn/llvm-project/llvm/trunk
-worksrcdir              release_${llvm_version_no_dot}
-svn.url                 http://llvm.org/svn/llvm-project/llvm/branches/release_${llvm_version_no_dot}
-default_variants-append +assertions
+#worksrcdir              release_${llvm_version_no_dot}
+#svn.url                 http://llvm.org/svn/llvm-project/llvm/branches/release_${llvm_version_no_dot}
+#default_variants-append +assertions
 
-#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
+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}
 
+if {${distfiles} != ""} {
+    if {${subport} == "llvm-${llvm_version}"} {
+        if {[variant_isset polly]} {
+            distfiles-append     polly-${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}
+    }
+}
+
+checksums           llvm-3.4.src.tar.gz \
+                    rmd160  67e3f7baa679ca95d944b9cc3528d1ffbe3cdee0 \
+                    sha256  25a5612d692c48481b9b397e2b55f4870e447966d66c96d655241702d44a2628 \
+                    polly-3.4.src.tar.gz \
+                    rmd160  995dc606934494344e2bdc20c1d1f49bf0cedd3c \
+                    sha256  9f1a5fb73dddc0afe47a0f4108dea818e0d1d16485899141957f87f75fa50ee7 \
+                    clang-3.4.src.tar.gz \
+                    rmd160  4fbd7e735edc96e224a82ebe2277c69efc488e6b \
+                    sha256  22a9780db3b85a7f2eb9ea1f7f6e00da0249e3d12851e8dea0f62f1783242b1b \
+                    compiler-rt-3.4.src.tar.gz \
+                    rmd160  530225a44fa743f80df759e5354a0854eb422306 \
+                    sha256  f37c89b1383ce462d47537a0245ac798600887a9be9f63073e16b79ed536ab5c \
+                    libcxx-3.4.src.tar.gz \
+                    rmd160  146a49dc0ae9635f87b13038d36ad816b7245666 \
+                    sha256  bd9f200279f0eb19fc28ed2d9d607dfd38e2e7d92bf52e7fb2161f89212e0deb
+
 patchfiles      install_target.patch \
                 tiger-shlib.patch
 
 patch.pre_args  -p1
 
 if {${subport} == "clang-${llvm_version}"} {
-    if {${distfiles} != ""} {
-        distfiles-append     clang-${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 \
                          0001-Comment-out-SL-cctools-workaround.patch
 
@@ -183,7 +205,7 @@
             } elseif {${worksrcdir} == "release_${llvm_version_no_dot}" } {
                 system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/polly/branches/release_${llvm_version_no_dot} polly"
             } else {
-                file rename ${workpath}/polly-${llvm_version}.src ${worksrcpath}/tools/polly
+                file rename ${workpath}/polly-${llvm_version} ${worksrcpath}/tools/polly
             }
         }
     } elseif {${subport} == "clang-${llvm_version}"} {
@@ -196,9 +218,9 @@
             system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/branches/release_${llvm_version_no_dot} compiler-rt"
             system "cd ${worksrcpath}/projects && svn co -r ${libcxx_rev} http://llvm.org/svn/llvm-project/libcxx/branches/release_${llvm_version_no_dot} libcxx"
         } else {
-            file rename ${workpath}/clang-${llvm_version}.src ${worksrcpath}/tools/clang
-            file rename ${workpath}/compiler-rt-${llvm_version}.src ${worksrcpath}/projects/compiler-rt
-            file rename ${workpath}/libcxx-${llvm_version}.src ${worksrcpath}/projects/libcxx
+            file rename ${workpath}/clang-${llvm_version} ${worksrcpath}/tools/clang
+            file rename ${workpath}/compiler-rt-${llvm_version} ${worksrcpath}/projects/compiler-rt
+            file rename ${workpath}/libcxx-${llvm_version} ${worksrcpath}/projects/libcxx
         }
     }
 }

Modified: trunk/dports/lang/llvm-3.5/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.5/Portfile	2014-01-07 19:50:17 UTC (rev 115644)
+++ trunk/dports/lang/llvm-3.5/Portfile	2014-01-07 20:21:11 UTC (rev 115645)
@@ -67,18 +67,24 @@
 #master_sites            http://llvm.org/releases/${version}
 #extract.suffix          .tar.gz
 #distfiles               llvm-${version}.src${extract.suffix}
-#worksrcdir              llvm-${version}.src
+#worksrcdir              llvm-${version}
 
+if {${distfiles} != ""} {
+    if {${subport} == "llvm-${llvm_version}"} {
+        if {[variant_isset polly]} {
+            distfiles-append     polly-${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}
+    }
+}
+
 patchfiles      install_target.patch \
                 tiger-shlib.patch
 
 patch.pre_args  -p1
 
 if {${subport} == "clang-${llvm_version}"} {
-    if {${distfiles} != ""} {
-        distfiles-append     clang-${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 \
                          0001-Comment-out-SL-cctools-workaround.patch
 
@@ -183,7 +189,7 @@
             } elseif {${worksrcdir} == "release_${llvm_version_no_dot}" } {
                 system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/polly/branches/release_${llvm_version_no_dot} polly"
             } else {
-                file rename ${workpath}/polly-${llvm_version}.src ${worksrcpath}/tools/polly
+                file rename ${workpath}/polly-${llvm_version} ${worksrcpath}/tools/polly
             }
         }
     } elseif {${subport} == "clang-${llvm_version}"} {
@@ -196,9 +202,9 @@
             system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/branches/release_${llvm_version_no_dot} compiler-rt"
             system "cd ${worksrcpath}/projects && svn co -r ${libcxx_rev} http://llvm.org/svn/llvm-project/libcxx/branches/release_${llvm_version_no_dot} libcxx"
         } else {
-            file rename ${workpath}/clang-${llvm_version}.src ${worksrcpath}/tools/clang
-            file rename ${workpath}/compiler-rt-${llvm_version}.src ${worksrcpath}/projects/compiler-rt
-            file rename ${workpath}/libcxx-${llvm_version}.src ${worksrcpath}/projects/libcxx
+            file rename ${workpath}/clang-${llvm_version} ${worksrcpath}/tools/clang
+            file rename ${workpath}/compiler-rt-${llvm_version} ${worksrcpath}/projects/compiler-rt
+            file rename ${workpath}/libcxx-${llvm_version} ${worksrcpath}/projects/libcxx
         }
     }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140107/f601b884/attachment.html>


More information about the macports-changes mailing list