[89146] trunk/dports/lang
jeremyhu at macports.org
jeremyhu at macports.org
Thu Jan 19 14:15:06 PST 2012
Revision: 89146
http://trac.macports.org/changeset/89146
Author: jeremyhu at macports.org
Date: 2012-01-19 14:15:01 -0800 (Thu, 19 Jan 2012)
Log Message:
-----------
llvm-*, clang-*, dragonegg-3.1: revbump 3.1s and address execution of clang++ (#32917)
Use scripts that exec the binaries rather than symlinks to address #32917
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/dragonegg-3.1/Portfile
trunk/dports/lang/llvm-2.9/Portfile
trunk/dports/lang/llvm-3.0/Portfile
trunk/dports/lang/llvm-3.1/Portfile
Added Paths:
-----------
trunk/dports/lang/clang-2.9/files/llvm-bin
trunk/dports/lang/clang-3.0/files/llvm-bin
trunk/dports/lang/clang-3.1/files/llvm-bin
trunk/dports/lang/llvm-2.9/files/llvm-bin
trunk/dports/lang/llvm-3.0/files/llvm-bin
trunk/dports/lang/llvm-3.1/files/llvm-bin
Removed Paths:
-------------
trunk/dports/lang/clang-2.9/files/scan-build
trunk/dports/lang/clang-2.9/files/scan-view
trunk/dports/lang/clang-3.0/files/scan-build
trunk/dports/lang/clang-3.0/files/scan-view
trunk/dports/lang/clang-3.1/files/scan-build
trunk/dports/lang/clang-3.1/files/scan-view
trunk/dports/lang/llvm-2.9/files/llvm-config
trunk/dports/lang/llvm-3.0/files/llvm-config
trunk/dports/lang/llvm-3.1/files/llvm-config
Modified: trunk/dports/lang/clang-2.9/Portfile
===================================================================
--- trunk/dports/lang/clang-2.9/Portfile 2012-01-19 22:14:11 UTC (rev 89145)
+++ trunk/dports/lang/clang-2.9/Portfile 2012-01-19 22:15:01 UTC (rev 89146)
@@ -4,7 +4,7 @@
PortGroup select 1.0
set llvm_version 2.9
-revision 2
+revision 3
name clang-${llvm_version}
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
@@ -111,16 +111,21 @@
ln -s ${sub_prefix}/libexec/scan-view/scan-view ${destroot}${sub_prefix}/bin/scan-view
ln -s ${sub_prefix}/bin ${destroot}${sub_prefix}/libexec/scan-build/bin
- xinstall -m 755 ${filespath}/scan-build "${destroot}${prefix}/bin/scan-build-${suffix}"
- xinstall -m 755 ${filespath}/scan-view "${destroot}${prefix}/bin/scan-view-${suffix}"
- reinplace "s:SUB_PREFIX:${sub_prefix}:" "${destroot}${prefix}/bin/scan-build-${suffix}"
- reinplace "s:SUB_PREFIX:${sub_prefix}:" "${destroot}${prefix}/bin/scan-view-${suffix}"
+ xinstall -m 755 "${filespath}/llvm-bin" "${destroot}${prefix}/bin/scan-build-${suffix}"
+ reinplace "s:EXEC_PATH:${sub_prefix}/bin/scan-build:" "${destroot}${prefix}/bin/scan-build-${suffix}"
+
+ xinstall -m 755 "${filespath}/llvm-bin" "${destroot}${prefix}/bin/view-${suffix}"
+ reinplace "s:EXEC_PATH:${sub_prefix}/bin/scan-view:" "${destroot}${prefix}/bin/view-${suffix}"
}
}
post-destroot {
foreach bin [glob ${destroot}${sub_prefix}/bin/*] {
- ln -s [string map "${destroot}${prefix} .." ${bin}] [string map "${sub_prefix} ${prefix}" ${bin}]-${suffix}
+ set bin_filename [string map "${sub_prefix} ${prefix}" ${bin}]-${suffix}
+ set exec_path [string map "${destroot}${sub_prefix} ${sub_prefix}" ${bin}]
+
+ xinstall -m 755 "${filespath}/llvm-bin" "${bin_filename}"
+ reinplace "s:EXEC_PATH:${exec_path}:" "${bin_filename}"
}
system "install_name_tool -id ${sub_prefix}/lib/libclang.dylib ${destroot}${sub_prefix}/lib/libclang.dylib"
Added: trunk/dports/lang/clang-2.9/files/llvm-bin
===================================================================
--- trunk/dports/lang/clang-2.9/files/llvm-bin (rev 0)
+++ trunk/dports/lang/clang-2.9/files/llvm-bin 2012-01-19 22:15:01 UTC (rev 89146)
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec EXEC_PATH "${@}"
Property changes on: trunk/dports/lang/clang-2.9/files/llvm-bin
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/dports/lang/clang-2.9/files/scan-build
===================================================================
--- trunk/dports/lang/clang-2.9/files/scan-build 2012-01-19 22:14:11 UTC (rev 89145)
+++ trunk/dports/lang/clang-2.9/files/scan-build 2012-01-19 22:15:01 UTC (rev 89146)
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec SUB_PREFIX/bin/scan-build "${@}"
Deleted: trunk/dports/lang/clang-2.9/files/scan-view
===================================================================
--- trunk/dports/lang/clang-2.9/files/scan-view 2012-01-19 22:14:11 UTC (rev 89145)
+++ trunk/dports/lang/clang-2.9/files/scan-view 2012-01-19 22:15:01 UTC (rev 89146)
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec SUB_PREFIX/bin/scan-view "${@}"
Modified: trunk/dports/lang/clang-3.0/Portfile
===================================================================
--- trunk/dports/lang/clang-3.0/Portfile 2012-01-19 22:14:11 UTC (rev 89145)
+++ trunk/dports/lang/clang-3.0/Portfile 2012-01-19 22:15:01 UTC (rev 89146)
@@ -4,7 +4,7 @@
PortGroup select 1.0
set llvm_version 3.0
-revision 1
+revision 2
name clang-${llvm_version}
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
@@ -111,16 +111,21 @@
ln -s ${sub_prefix}/libexec/scan-view/scan-view ${destroot}${sub_prefix}/bin/scan-view
ln -s ${sub_prefix}/bin ${destroot}${sub_prefix}/libexec/scan-build/bin
- xinstall -m 755 ${filespath}/scan-build "${destroot}${prefix}/bin/scan-build-${suffix}"
- xinstall -m 755 ${filespath}/scan-view "${destroot}${prefix}/bin/scan-view-${suffix}"
- reinplace "s:SUB_PREFIX:${sub_prefix}:" "${destroot}${prefix}/bin/scan-build-${suffix}"
- reinplace "s:SUB_PREFIX:${sub_prefix}:" "${destroot}${prefix}/bin/scan-view-${suffix}"
+ xinstall -m 755 "${filespath}/llvm-bin" "${destroot}${prefix}/bin/scan-build-${suffix}"
+ reinplace "s:EXEC_PATH:${sub_prefix}/bin/scan-build:" "${destroot}${prefix}/bin/scan-build-${suffix}"
+
+ xinstall -m 755 "${filespath}/llvm-bin" "${destroot}${prefix}/bin/view-${suffix}"
+ reinplace "s:EXEC_PATH:${sub_prefix}/bin/scan-view:" "${destroot}${prefix}/bin/view-${suffix}"
}
}
post-destroot {
foreach bin [glob ${destroot}${sub_prefix}/bin/*] {
- ln -s [string map "${destroot}${prefix} .." ${bin}] [string map "${sub_prefix} ${prefix}" ${bin}]-${suffix}
+ set bin_filename [string map "${sub_prefix} ${prefix}" ${bin}]-${suffix}
+ set exec_path [string map "${destroot}${sub_prefix} ${sub_prefix}" ${bin}]
+
+ xinstall -m 755 "${filespath}/llvm-bin" "${bin_filename}"
+ reinplace "s:EXEC_PATH:${exec_path}:" "${bin_filename}"
}
system "install_name_tool -id ${sub_prefix}/lib/libclang.dylib ${destroot}${sub_prefix}/lib/libclang.dylib"
Added: trunk/dports/lang/clang-3.0/files/llvm-bin
===================================================================
--- trunk/dports/lang/clang-3.0/files/llvm-bin (rev 0)
+++ trunk/dports/lang/clang-3.0/files/llvm-bin 2012-01-19 22:15:01 UTC (rev 89146)
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec EXEC_PATH "${@}"
Property changes on: trunk/dports/lang/clang-3.0/files/llvm-bin
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/dports/lang/clang-3.0/files/scan-build
===================================================================
--- trunk/dports/lang/clang-3.0/files/scan-build 2012-01-19 22:14:11 UTC (rev 89145)
+++ trunk/dports/lang/clang-3.0/files/scan-build 2012-01-19 22:15:01 UTC (rev 89146)
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec SUB_PREFIX/bin/scan-build "${@}"
Deleted: trunk/dports/lang/clang-3.0/files/scan-view
===================================================================
--- trunk/dports/lang/clang-3.0/files/scan-view 2012-01-19 22:14:11 UTC (rev 89145)
+++ trunk/dports/lang/clang-3.0/files/scan-view 2012-01-19 22:15:01 UTC (rev 89146)
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec SUB_PREFIX/bin/scan-view "${@}"
Modified: trunk/dports/lang/clang-3.1/Portfile
===================================================================
--- trunk/dports/lang/clang-3.1/Portfile 2012-01-19 22:14:11 UTC (rev 89145)
+++ trunk/dports/lang/clang-3.1/Portfile 2012-01-19 22:15:01 UTC (rev 89146)
@@ -4,7 +4,6 @@
PortGroup select 1.0
set llvm_version 3.1
-revision 1
name clang-${llvm_version}
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
@@ -33,7 +32,7 @@
universal_variant no
fetch.type svn
-svn.revision 147925
+svn.revision 148486
version ${llvm_version}-r${svn.revision}
worksrcdir trunk
svn.url http://llvm.org/svn/llvm-project/llvm/trunk
@@ -105,16 +104,21 @@
ln -s ${sub_prefix}/libexec/scan-view/scan-view ${destroot}${sub_prefix}/bin/scan-view
ln -s ${sub_prefix}/bin ${destroot}${sub_prefix}/libexec/scan-build/bin
- xinstall -m 755 ${filespath}/scan-build "${destroot}${prefix}/bin/scan-build-${suffix}"
- xinstall -m 755 ${filespath}/scan-view "${destroot}${prefix}/bin/scan-view-${suffix}"
- reinplace "s:SUB_PREFIX:${sub_prefix}:" "${destroot}${prefix}/bin/scan-build-${suffix}"
- reinplace "s:SUB_PREFIX:${sub_prefix}:" "${destroot}${prefix}/bin/scan-view-${suffix}"
+ xinstall -m 755 "${filespath}/llvm-bin" "${destroot}${prefix}/bin/scan-build-${suffix}"
+ reinplace "s:EXEC_PATH:${sub_prefix}/bin/scan-build:" "${destroot}${prefix}/bin/scan-build-${suffix}"
+
+ xinstall -m 755 "${filespath}/llvm-bin" "${destroot}${prefix}/bin/view-${suffix}"
+ reinplace "s:EXEC_PATH:${sub_prefix}/bin/scan-view:" "${destroot}${prefix}/bin/view-${suffix}"
}
}
post-destroot {
foreach bin [glob ${destroot}${sub_prefix}/bin/*] {
- ln -s [string map "${destroot}${prefix} .." ${bin}] [string map "${sub_prefix} ${prefix}" ${bin}]-${suffix}
+ set bin_filename [string map "${sub_prefix} ${prefix}" ${bin}]-${suffix}
+ set exec_path [string map "${destroot}${sub_prefix} ${sub_prefix}" ${bin}]
+
+ xinstall -m 755 "${filespath}/llvm-bin" "${bin_filename}"
+ reinplace "s:EXEC_PATH:${exec_path}:" "${bin_filename}"
}
system "install_name_tool -id ${sub_prefix}/lib/libclang.dylib ${destroot}${sub_prefix}/lib/libclang.dylib"
Added: trunk/dports/lang/clang-3.1/files/llvm-bin
===================================================================
--- trunk/dports/lang/clang-3.1/files/llvm-bin (rev 0)
+++ trunk/dports/lang/clang-3.1/files/llvm-bin 2012-01-19 22:15:01 UTC (rev 89146)
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec EXEC_PATH "${@}"
Property changes on: trunk/dports/lang/clang-3.1/files/llvm-bin
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/dports/lang/clang-3.1/files/scan-build
===================================================================
--- trunk/dports/lang/clang-3.1/files/scan-build 2012-01-19 22:14:11 UTC (rev 89145)
+++ trunk/dports/lang/clang-3.1/files/scan-build 2012-01-19 22:15:01 UTC (rev 89146)
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec SUB_PREFIX/bin/scan-build "${@}"
Deleted: trunk/dports/lang/clang-3.1/files/scan-view
===================================================================
--- trunk/dports/lang/clang-3.1/files/scan-view 2012-01-19 22:14:11 UTC (rev 89145)
+++ trunk/dports/lang/clang-3.1/files/scan-view 2012-01-19 22:15:01 UTC (rev 89146)
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec SUB_PREFIX/bin/scan-view "${@}"
Modified: trunk/dports/lang/dragonegg-3.1/Portfile
===================================================================
--- trunk/dports/lang/dragonegg-3.1/Portfile 2012-01-19 22:14:11 UTC (rev 89145)
+++ trunk/dports/lang/dragonegg-3.1/Portfile 2012-01-19 22:15:01 UTC (rev 89146)
@@ -24,7 +24,7 @@
depends_run port:gcc_select
fetch.type svn
-svn.revision 147925
+svn.revision 148486
version ${llvm_version}-r${svn.revision}
worksrcdir trunk
svn.url http://llvm.org/svn/llvm-project/dragonegg/trunk
Modified: trunk/dports/lang/llvm-2.9/Portfile
===================================================================
--- trunk/dports/lang/llvm-2.9/Portfile 2012-01-19 22:14:11 UTC (rev 89145)
+++ trunk/dports/lang/llvm-2.9/Portfile 2012-01-19 22:15:01 UTC (rev 89146)
@@ -4,7 +4,7 @@
PortGroup select 1.0
set llvm_version 2.9
-revision 1
+revision 2
name llvm-${llvm_version}
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/${name}
@@ -100,10 +100,10 @@
}
foreach bin [glob ${destroot}${sub_prefix}/bin/*] {
- ln -s [string map "${destroot}${prefix} .." ${bin}] [string map "${sub_prefix} ${prefix}" ${bin}]-${suffix}
+ set bin_filename [string map "${sub_prefix} ${prefix}" ${bin}]-${suffix}
+ set exec_path [string map "${destroot}${sub_prefix} ${sub_prefix}" ${bin}]
+
+ xinstall -m 755 "${filespath}/llvm-bin" "${bin_filename}"
+ reinplace "s:EXEC_PATH:${exec_path}:" "${bin_filename}"
}
-
- file delete "${destroot}${prefix}/bin/llvm-config-${suffix}"
- xinstall -m 755 ${filespath}/llvm-config "${destroot}${prefix}/bin/llvm-config-${suffix}"
- reinplace "s:SUB_PREFIX:${sub_prefix}:" "${destroot}${prefix}/bin/llvm-config-${suffix}"
}
Copied: trunk/dports/lang/llvm-2.9/files/llvm-bin (from rev 89057, trunk/dports/lang/llvm-2.9/files/llvm-config)
===================================================================
--- trunk/dports/lang/llvm-2.9/files/llvm-bin (rev 0)
+++ trunk/dports/lang/llvm-2.9/files/llvm-bin 2012-01-19 22:15:01 UTC (rev 89146)
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec EXEC_PATH "${@}"
Deleted: trunk/dports/lang/llvm-2.9/files/llvm-config
===================================================================
--- trunk/dports/lang/llvm-2.9/files/llvm-config 2012-01-19 22:14:11 UTC (rev 89145)
+++ trunk/dports/lang/llvm-2.9/files/llvm-config 2012-01-19 22:15:01 UTC (rev 89146)
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec SUB_PREFIX/bin/llvm-config "${@}"
Modified: trunk/dports/lang/llvm-3.0/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.0/Portfile 2012-01-19 22:14:11 UTC (rev 89145)
+++ trunk/dports/lang/llvm-3.0/Portfile 2012-01-19 22:15:01 UTC (rev 89146)
@@ -4,7 +4,7 @@
PortGroup select 1.0
set llvm_version 3.0
-revision 1
+revision 2
name llvm-${llvm_version}
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/${name}
@@ -100,10 +100,10 @@
}
foreach bin [glob ${destroot}${sub_prefix}/bin/*] {
- ln -s [string map "${destroot}${prefix} .." ${bin}] [string map "${sub_prefix} ${prefix}" ${bin}]-${suffix}
+ set bin_filename [string map "${sub_prefix} ${prefix}" ${bin}]-${suffix}
+ set exec_path [string map "${destroot}${sub_prefix} ${sub_prefix}" ${bin}]
+
+ xinstall -m 755 "${filespath}/llvm-bin" "${bin_filename}"
+ reinplace "s:EXEC_PATH:${exec_path}:" "${bin_filename}"
}
-
- file delete "${destroot}${prefix}/bin/llvm-config-${suffix}"
- xinstall -m 755 ${filespath}/llvm-config "${destroot}${prefix}/bin/llvm-config-${suffix}"
- reinplace "s:SUB_PREFIX:${sub_prefix}:" "${destroot}${prefix}/bin/llvm-config-${suffix}"
}
Copied: trunk/dports/lang/llvm-3.0/files/llvm-bin (from rev 89057, trunk/dports/lang/llvm-3.0/files/llvm-config)
===================================================================
--- trunk/dports/lang/llvm-3.0/files/llvm-bin (rev 0)
+++ trunk/dports/lang/llvm-3.0/files/llvm-bin 2012-01-19 22:15:01 UTC (rev 89146)
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec EXEC_PATH "${@}"
Deleted: trunk/dports/lang/llvm-3.0/files/llvm-config
===================================================================
--- trunk/dports/lang/llvm-3.0/files/llvm-config 2012-01-19 22:14:11 UTC (rev 89145)
+++ trunk/dports/lang/llvm-3.0/files/llvm-config 2012-01-19 22:15:01 UTC (rev 89146)
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec SUB_PREFIX/bin/llvm-config "${@}"
Modified: trunk/dports/lang/llvm-3.1/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.1/Portfile 2012-01-19 22:14:11 UTC (rev 89145)
+++ trunk/dports/lang/llvm-3.1/Portfile 2012-01-19 22:15:01 UTC (rev 89146)
@@ -4,7 +4,6 @@
PortGroup select 1.0
set llvm_version 3.1
-revision 1
name llvm-${llvm_version}
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/${name}
@@ -26,7 +25,7 @@
depends_run bin:perl:perl5 port:llvm_select
fetch.type svn
-svn.revision 147925
+svn.revision 148486
version ${llvm_version}-r${svn.revision}
worksrcdir trunk
svn.url http://llvm.org/svn/llvm-project/llvm/trunk
@@ -97,10 +96,10 @@
}
foreach bin [glob ${destroot}${sub_prefix}/bin/*] {
- ln -s [string map "${destroot}${prefix} .." ${bin}] [string map "${sub_prefix} ${prefix}" ${bin}]-${suffix}
- }
+ set bin_filename [string map "${sub_prefix} ${prefix}" ${bin}]-${suffix}
+ set exec_path [string map "${destroot}${sub_prefix} ${sub_prefix}" ${bin}]
- file delete "${destroot}${prefix}/bin/llvm-config-${suffix}"
- xinstall -m 755 ${filespath}/llvm-config "${destroot}${prefix}/bin/llvm-config-${suffix}"
- reinplace "s:SUB_PREFIX:${sub_prefix}:" "${destroot}${prefix}/bin/llvm-config-${suffix}"
+ xinstall -m 755 "${filespath}/llvm-bin" "${bin_filename}"
+ reinplace "s:EXEC_PATH:${exec_path}:" "${bin_filename}"
+ }
}
Copied: trunk/dports/lang/llvm-3.1/files/llvm-bin (from rev 89057, trunk/dports/lang/llvm-3.1/files/llvm-config)
===================================================================
--- trunk/dports/lang/llvm-3.1/files/llvm-bin (rev 0)
+++ trunk/dports/lang/llvm-3.1/files/llvm-bin 2012-01-19 22:15:01 UTC (rev 89146)
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec EXEC_PATH "${@}"
Deleted: trunk/dports/lang/llvm-3.1/files/llvm-config
===================================================================
--- trunk/dports/lang/llvm-3.1/files/llvm-config 2012-01-19 22:14:11 UTC (rev 89145)
+++ trunk/dports/lang/llvm-3.1/files/llvm-config 2012-01-19 22:15:01 UTC (rev 89146)
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec SUB_PREFIX/bin/llvm-config "${@}"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120119/74180b30/attachment-0001.html>
More information about the macports-changes
mailing list