[95431] trunk/dports/lang

jeremyhu at macports.org jeremyhu at macports.org
Thu Jul 12 12:05:11 PDT 2012


Revision: 95431
          https://trac.macports.org/changeset/95431
Author:   jeremyhu at macports.org
Date:     2012-07-12 12:05:11 -0700 (Thu, 12 Jul 2012)
Log Message:
-----------
{clang,dragonegg,llvm}-*: Bump 3.2 version, install clang libs for 3.1, 3.2 (#34214), fix +analyzer scripts (#35006, #35106)

Modified Paths:
--------------
    trunk/dports/lang/clang-2.9/Portfile
    trunk/dports/lang/clang-3.0/Portfile
    trunk/dports/lang/clang-3.1/Portfile
    trunk/dports/lang/clang-3.1/files/install_target.patch
    trunk/dports/lang/clang-3.2/Portfile
    trunk/dports/lang/clang-3.2/files/install_target.patch
    trunk/dports/lang/dragonegg-3.2/Portfile
    trunk/dports/lang/llvm-3.2/Portfile

Added Paths:
-----------
    trunk/dports/lang/clang-2.9/files/scan-build-PR-35006.patch
    trunk/dports/lang/clang-3.0/files/scan-build-PR-35006.patch
    trunk/dports/lang/clang-3.1/files/scan-build-PR-35006.patch
    trunk/dports/lang/clang-3.2/files/scan-build-PR-35006.patch

Modified: trunk/dports/lang/clang-2.9/Portfile
===================================================================
--- trunk/dports/lang/clang-2.9/Portfile	2012-07-12 16:10:59 UTC (rev 95430)
+++ trunk/dports/lang/clang-2.9/Portfile	2012-07-12 19:05:11 UTC (rev 95431)
@@ -4,7 +4,7 @@
 PortGroup select        1.0
 
 set llvm_version        2.9
-revision                9
+revision                10
 name                    clang-${llvm_version}
 set suffix              mp-${llvm_version}
 set sub_prefix          ${prefix}/libexec/llvm-${llvm_version}
@@ -59,7 +59,8 @@
 patchfiles      install_target.patch \
                 tiger-shlib.patch \
                 tiger-shlib-clang.patch \
-                0001-Add-a-few-missing-template-keywords.patch
+                0001-Add-a-few-missing-template-keywords.patch \
+                scan-build-PR-35006.patch
 patch.pre_args  -p1
 
 build.target            clang-only
@@ -162,7 +163,7 @@
 }
 
 variant analyzer description {Install clang static analyzer} {
-    depends_run-append  bin:python:python26 bin:perl:perl5
+    depends_run-append  port:python26 port:perl5
     post-patch {
         reinplace "s|/usr/bin/env perl|${prefix}/bin/perl5|g" \
             ${worksrcpath}/tools/clang/tools/scan-build/ccc-analyzer \

Added: trunk/dports/lang/clang-2.9/files/scan-build-PR-35006.patch
===================================================================
--- trunk/dports/lang/clang-2.9/files/scan-build-PR-35006.patch	                        (rev 0)
+++ trunk/dports/lang/clang-2.9/files/scan-build-PR-35006.patch	2012-07-12 19:05:11 UTC (rev 95431)
@@ -0,0 +1,11 @@
+--- a/tools/clang/tools/scan-build/scan-build.orig	2012-07-12 09:47:19.000000000 -0700
++++ b/tools/clang/tools/scan-build/scan-build	2012-07-12 09:49:15.000000000 -0700
+@@ -1399,6 +1399,8 @@ if (defined $OutputFormat) {
+       Diag "Analysis run complete.\n";
+       Diag "Viewing analysis results in '$HtmlDir' using scan-view.\n";
+       my $ScanView = Cwd::realpath("$RealBin/scan-view");
++      if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/bin/scan-view"); }
++      if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/../scan-view/scan-view"); }
+       if (! -x $ScanView) { $ScanView = "scan-view"; }
+       exec $ScanView, "$HtmlDir";
+     }

Modified: trunk/dports/lang/clang-3.0/Portfile
===================================================================
--- trunk/dports/lang/clang-3.0/Portfile	2012-07-12 16:10:59 UTC (rev 95430)
+++ trunk/dports/lang/clang-3.0/Portfile	2012-07-12 19:05:11 UTC (rev 95431)
@@ -4,7 +4,7 @@
 PortGroup select        1.0
 
 set llvm_version        3.0
-revision                8
+revision                9
 name                    clang-${llvm_version}
 set suffix              mp-${llvm_version}
 set sub_prefix          ${prefix}/libexec/llvm-${llvm_version}
@@ -59,7 +59,8 @@
 patchfiles      install_target.patch \
                 tiger-shlib.patch \
                 tiger-shlib-clang.patch \
-                0001-Add-a-few-missing-template-keywords.patch
+                0001-Add-a-few-missing-template-keywords.patch \
+                scan-build-PR-35006.patch
 patch.pre_args  -p1
 
 build.target            clang-only
@@ -160,7 +161,7 @@
 }
 
 variant analyzer description {Install clang static analyzer} {
-    depends_run-append  bin:python:python26 bin:perl:perl5
+    depends_run-append  port:python26 port:perl5
     post-patch {
         reinplace "s|/usr/bin/env perl|${prefix}/bin/perl5|g" \
             ${worksrcpath}/tools/clang/tools/scan-build/ccc-analyzer \

Added: trunk/dports/lang/clang-3.0/files/scan-build-PR-35006.patch
===================================================================
--- trunk/dports/lang/clang-3.0/files/scan-build-PR-35006.patch	                        (rev 0)
+++ trunk/dports/lang/clang-3.0/files/scan-build-PR-35006.patch	2012-07-12 19:05:11 UTC (rev 95431)
@@ -0,0 +1,11 @@
+--- a/tools/clang/tools/scan-build/scan-build.orig	2012-07-12 09:47:19.000000000 -0700
++++ b/tools/clang/tools/scan-build/scan-build	2012-07-12 09:49:15.000000000 -0700
+@@ -1399,6 +1399,8 @@ if (defined $OutputFormat) {
+       Diag "Analysis run complete.\n";
+       Diag "Viewing analysis results in '$HtmlDir' using scan-view.\n";
+       my $ScanView = Cwd::realpath("$RealBin/scan-view");
++      if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/bin/scan-view"); }
++      if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/../scan-view/scan-view"); }
+       if (! -x $ScanView) { $ScanView = "scan-view"; }
+       exec $ScanView, "$HtmlDir";
+     }

Modified: trunk/dports/lang/clang-3.1/Portfile
===================================================================
--- trunk/dports/lang/clang-3.1/Portfile	2012-07-12 16:10:59 UTC (rev 95430)
+++ trunk/dports/lang/clang-3.1/Portfile	2012-07-12 19:05:11 UTC (rev 95431)
@@ -4,7 +4,7 @@
 PortGroup select        1.0
 
 set llvm_version        3.1
-revision		1
+revision		2
 name                    clang-${llvm_version}
 set suffix              mp-${llvm_version}
 set sub_prefix          ${prefix}/libexec/llvm-${llvm_version}
@@ -62,7 +62,8 @@
 patchfiles      install_target.patch \
                 tiger.patch  \
                 tiger-shlib.patch \
-                tiger-shlib-clang.patch
+                tiger-shlib-clang.patch \
+                scan-build-PR-35006.patch
 patch.pre_args  -p1
 
 build.target            clang-only
@@ -172,7 +173,7 @@
 }
 
 variant analyzer description {Install clang static analyzer} {
-    depends_run-append  bin:python:python26 bin:perl:perl5
+    depends_run-append  port:python26 port:perl5
     post-patch {
         reinplace "s|/usr/bin/env perl|${prefix}/bin/perl5|g" \
             ${worksrcpath}/tools/clang/tools/scan-build/ccc-analyzer \

Modified: trunk/dports/lang/clang-3.1/files/install_target.patch
===================================================================
--- trunk/dports/lang/clang-3.1/files/install_target.patch	2012-07-12 16:10:59 UTC (rev 95430)
+++ trunk/dports/lang/clang-3.1/files/install_target.patch	2012-07-12 19:05:11 UTC (rev 95431)
@@ -6,7 +6,7 @@
 -          tools/clang/include/clang-c \
 -          tools/clang/runtime tools/clang/docs \
 -          tools/lto runtime
-+          tools/clang/include \
++          tools/clang/include tools/clang/lib \
 +          tools/clang/runtime tools/clang/docs
    OPTIONAL_DIRS :=
    NO_INSTALL = 1

Added: trunk/dports/lang/clang-3.1/files/scan-build-PR-35006.patch
===================================================================
--- trunk/dports/lang/clang-3.1/files/scan-build-PR-35006.patch	                        (rev 0)
+++ trunk/dports/lang/clang-3.1/files/scan-build-PR-35006.patch	2012-07-12 19:05:11 UTC (rev 95431)
@@ -0,0 +1,11 @@
+--- a/tools/clang/tools/scan-build/scan-build.orig	2012-07-12 09:47:19.000000000 -0700
++++ b/tools/clang/tools/scan-build/scan-build	2012-07-12 09:49:15.000000000 -0700
+@@ -1399,6 +1399,8 @@ if (defined $OutputFormat) {
+       Diag "Analysis run complete.\n";
+       Diag "Viewing analysis results in '$HtmlDir' using scan-view.\n";
+       my $ScanView = Cwd::realpath("$RealBin/scan-view");
++      if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/bin/scan-view"); }
++      if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/../scan-view/scan-view"); }
+       if (! -x $ScanView) { $ScanView = "scan-view"; }
+       exec $ScanView, "$HtmlDir";
+     }

Modified: trunk/dports/lang/clang-3.2/Portfile
===================================================================
--- trunk/dports/lang/clang-3.2/Portfile	2012-07-12 16:10:59 UTC (rev 95430)
+++ trunk/dports/lang/clang-3.2/Portfile	2012-07-12 19:05:11 UTC (rev 95431)
@@ -4,7 +4,7 @@
 PortGroup select        1.0
 
 set llvm_version        3.2
-revision		1
+revision		0
 name                    clang-${llvm_version}
 set suffix              mp-${llvm_version}
 set sub_prefix          ${prefix}/libexec/llvm-${llvm_version}
@@ -33,7 +33,7 @@
 default_variants        +analyzer
 
 fetch.type              svn
-svn.revision            158350
+svn.revision            160101
 version                 ${llvm_version}-r${svn.revision}
 set compiler_rt_rev     ${svn.revision}
 worksrcdir              trunk
@@ -53,7 +53,8 @@
 patchfiles      install_target.patch \
                 tiger.patch  \
                 tiger-shlib.patch \
-                tiger-shlib-clang.patch
+                tiger-shlib-clang.patch \
+                scan-build-PR-35006.patch
 patch.pre_args  -p1
 
 build.target            clang-only
@@ -162,7 +163,7 @@
 }
 
 variant analyzer description {Install clang static analyzer} {
-    depends_run-append  bin:python:python26 bin:perl:perl5
+    depends_run-append  port:python26 port:perl5
     post-patch {
         reinplace "s|/usr/bin/env perl|${prefix}/bin/perl5|g" \
             ${worksrcpath}/tools/clang/tools/scan-build/ccc-analyzer \

Modified: trunk/dports/lang/clang-3.2/files/install_target.patch
===================================================================
--- trunk/dports/lang/clang-3.2/files/install_target.patch	2012-07-12 16:10:59 UTC (rev 95430)
+++ trunk/dports/lang/clang-3.2/files/install_target.patch	2012-07-12 19:05:11 UTC (rev 95431)
@@ -6,7 +6,7 @@
 -          tools/clang/include/clang-c \
 -          tools/clang/runtime tools/clang/docs \
 -          tools/lto runtime
-+          tools/clang/include \
++          tools/clang/include tools/clang/lib \
 +          tools/clang/runtime tools/clang/docs
    OPTIONAL_DIRS :=
    NO_INSTALL = 1

Added: trunk/dports/lang/clang-3.2/files/scan-build-PR-35006.patch
===================================================================
--- trunk/dports/lang/clang-3.2/files/scan-build-PR-35006.patch	                        (rev 0)
+++ trunk/dports/lang/clang-3.2/files/scan-build-PR-35006.patch	2012-07-12 19:05:11 UTC (rev 95431)
@@ -0,0 +1,11 @@
+--- a/tools/clang/tools/scan-build/scan-build.orig	2012-07-12 09:47:19.000000000 -0700
++++ b/tools/clang/tools/scan-build/scan-build	2012-07-12 09:49:15.000000000 -0700
+@@ -1399,6 +1399,8 @@ if (defined $OutputFormat) {
+       Diag "Analysis run complete.\n";
+       Diag "Viewing analysis results in '$HtmlDir' using scan-view.\n";
+       my $ScanView = Cwd::realpath("$RealBin/scan-view");
++      if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/bin/scan-view"); }
++      if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/../scan-view/scan-view"); }
+       if (! -x $ScanView) { $ScanView = "scan-view"; }
+       exec $ScanView, "$HtmlDir";
+     }

Modified: trunk/dports/lang/dragonegg-3.2/Portfile
===================================================================
--- trunk/dports/lang/dragonegg-3.2/Portfile	2012-07-12 16:10:59 UTC (rev 95430)
+++ trunk/dports/lang/dragonegg-3.2/Portfile	2012-07-12 19:05:11 UTC (rev 95431)
@@ -29,7 +29,7 @@
 depends_skip_archcheck-append gcc${gcc_version}
 
 fetch.type              svn
-svn.revision            158350
+svn.revision            160101
 version                 ${llvm_version}-r${svn.revision}
 worksrcdir              trunk
 svn.url                 http://llvm.org/svn/llvm-project/dragonegg/trunk

Modified: trunk/dports/lang/llvm-3.2/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.2/Portfile	2012-07-12 16:10:59 UTC (rev 95430)
+++ trunk/dports/lang/llvm-3.2/Portfile	2012-07-12 19:05:11 UTC (rev 95431)
@@ -4,7 +4,7 @@
 PortGroup select        1.0
 
 set llvm_version        3.2
-revision		1
+revision		0
 name                    llvm-${llvm_version}
 set suffix              mp-${llvm_version}
 set sub_prefix          ${prefix}/libexec/${name}
@@ -27,7 +27,7 @@
 depends_run             bin:perl:perl5 port:llvm_select
 
 fetch.type              svn
-svn.revision            158350
+svn.revision            160101
 version                 ${llvm_version}-r${svn.revision}
 worksrcdir              trunk
 svn.url                 http://llvm.org/svn/llvm-project/llvm/trunk
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120712/d0e652c1/attachment.html>


More information about the macports-changes mailing list