[135930] trunk/dports/lang/llvm-3.7/Portfile

larryv at macports.org larryv at macports.org
Wed May 6 21:02:19 PDT 2015


Revision: 135930
          https://trac.macports.org/changeset/135930
Author:   larryv at macports.org
Date:     2015-05-06 21:02:19 -0700 (Wed, 06 May 2015)
Log Message:
-----------
llvm-3.7: Fix post-extract behind HTTP proxies (#47648)

The primary Subversion checkout worked fine because base correctly
accounts for proxies, but the additional checkouts in the post-extract
script did not.  Thanks to raimue for the workaround.

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

Modified: trunk/dports/lang/llvm-3.7/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.7/Portfile	2015-05-07 04:02:16 UTC (rev 135929)
+++ trunk/dports/lang/llvm-3.7/Portfile	2015-05-07 04:02:19 UTC (rev 135930)
@@ -234,27 +234,29 @@
 }
 
 post-extract {
+    # Get HTTP proxy arguments if required, assuming we can use the same proxy for all repositories
+    set proxy_args [portfetch::svn_proxy_args http://llvm.org/svn/llvm-project/cfe/trunk]
     if {${subport} eq "llvm-${llvm_version}"} {
         if {[variant_isset polly]} {
             if {${worksrcdir} eq "trunk"} {
-                system -W ${worksrcpath}/tools "svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/polly/trunk polly"
+                system -W ${worksrcpath}/tools "svn ${proxy_args} co -r ${svn.revision} http://llvm.org/svn/llvm-project/polly/trunk polly"
             } elseif {${worksrcdir} eq "release_${llvm_version_no_dot}" } {
-                system -W ${worksrcpath}/tools "svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/polly/branches/release_${llvm_version_no_dot} polly"
+                system -W ${worksrcpath}/tools "svn ${proxy_args} co -r ${svn.revision} http://llvm.org/svn/llvm-project/polly/branches/release_${llvm_version_no_dot} polly"
             } else {
                 file rename ${workpath}/polly-${version}.src ${worksrcpath}/tools/polly
             }
         }
     } elseif {${subport} eq "clang-${llvm_version}"} {
         if {${worksrcdir} eq "trunk"} {
-            system -W ${worksrcpath}/tools "svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/cfe/trunk clang"
-            system -W ${worksrcpath}/projects "svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/trunk compiler-rt"
-            system -W ${worksrcpath}/projects "svn co -r ${libcxx_rev} http://llvm.org/svn/llvm-project/libcxx/trunk libcxx"
-            system -W ${worksrcpath}/tools/clang/tools "svn co -r ${clang-modernize_rev} http://llvm.org/svn/llvm-project/clang-tools-extra/trunk extra"
+            system -W ${worksrcpath}/tools "svn ${proxy_args} co -r ${svn.revision} http://llvm.org/svn/llvm-project/cfe/trunk clang"
+            system -W ${worksrcpath}/projects "svn ${proxy_args} co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/trunk compiler-rt"
+            system -W ${worksrcpath}/projects "svn ${proxy_args} co -r ${libcxx_rev} http://llvm.org/svn/llvm-project/libcxx/trunk libcxx"
+            system -W ${worksrcpath}/tools/clang/tools "svn ${proxy_args} co -r ${clang-modernize_rev} http://llvm.org/svn/llvm-project/clang-tools-extra/trunk extra"
         } elseif {${worksrcdir} eq "release_${llvm_version_no_dot}" } {
-            system -W ${worksrcpath}/tools "svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/cfe/branches/release_${llvm_version_no_dot} clang"
-            system -W ${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 -W ${worksrcpath}/projects "svn co -r ${libcxx_rev} http://llvm.org/svn/llvm-project/libcxx/branches/release_${llvm_version_no_dot} libcxx"
-            system -W ${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"
+            system -W ${worksrcpath}/tools "svn ${proxy_args} co -r ${svn.revision} http://llvm.org/svn/llvm-project/cfe/branches/release_${llvm_version_no_dot} clang"
+            system -W ${worksrcpath}/projects "svn ${proxy_args} co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/branches/release_${llvm_version_no_dot} compiler-rt"
+            system -W ${worksrcpath}/projects "svn ${proxy_args} co -r ${libcxx_rev} http://llvm.org/svn/llvm-project/libcxx/branches/release_${llvm_version_no_dot} libcxx"
+            system -W ${worksrcpath}/tools/clang/tools "svn ${proxy_args} 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}/cfe-${version}.src ${worksrcpath}/tools/clang
             file rename ${workpath}/compiler-rt-${version}.src ${worksrcpath}/projects/compiler-rt
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150506/5ecb53a4/attachment.html>


More information about the macports-changes mailing list