[88066] trunk/dports/lang/dragonegg-3.0

[jeremyhu at macports.org]

Revision: 88066
          http://trac.macports.org/changeset/88066
Author:   jeremyhu at macports.org
Date:     2011-12-17 02:55:29 -0800 (Sat, 17 Dec 2011)
Log Message:
-----------
dragonegg-3.0: Make gcc driver script a bit more robust and build with the correct compiler.

Modified Paths:
--------------
    trunk/dports/lang/dragonegg-3.0/Portfile
    trunk/dports/lang/dragonegg-3.0/files/dragonegg-3.0-gcc46
    trunk/dports/lang/dragonegg-3.0/files/dragonegg-gcc

Modified: trunk/dports/lang/dragonegg-3.0/Portfile
===================================================================
--- trunk/dports/lang/dragonegg-3.0/Portfile	2011-12-17 10:49:29 UTC (rev 88065)
+++ trunk/dports/lang/dragonegg-3.0/Portfile	2011-12-17 10:55:29 UTC (rev 88066)
@@ -8,7 +8,7 @@
 name                    dragonegg-${llvm_version}
 set gcc_version         46
 set gcc_version_dot     4.6
-revision                1
+revision                2
 categories              lang
 platforms               darwin
 maintainers             jeremyhu openmaintainer
@@ -54,19 +54,25 @@
 
 build.target
 
-build.env-append LLVM_CONFIG=${prefix}/bin/llvm-config-mp-${llvm_version} GCC=${prefix}/bin/gcc-mp-${gcc_version_dot}
+build.env-append \
+    LLVM_CONFIG=${prefix}/bin/llvm-config-mp-${llvm_version} \
+    GCC=${prefix}/bin/gcc-mp-${gcc_version_dot} \
+    CC="${configure.cc} ${configure.cppflags}" \
+    CXX="${configure.cxx} ${configure.cppflags}"
 
 destroot {
     xinstall -m 755 -d ${destroot}${prefix}/libexec/dragonegg
     xinstall -m 755 ${worksrcpath}/dragonegg.so ${destroot}${prefix}/libexec/dragonegg/llvm-${llvm_version}-gcc${gcc_version}.so
 
-    xinstall -m 755 ${filespath}/dragonegg-gcc ${destroot}${prefix}/bin/dragonegg-${llvm_version}-gcc-mp-${gcc_version_dot}
-    ln -s dragonegg-${llvm_version}-gcc-mp-${gcc_version_dot} ${destroot}${prefix}/bin/dragonegg-${llvm_version}-cpp-mp-${gcc_version_dot}
-    ln -s dragonegg-${llvm_version}-gcc-mp-${gcc_version_dot} ${destroot}${prefix}/bin/dragonegg-${llvm_version}-c++-mp-${gcc_version_dot}
-    ln -s dragonegg-${llvm_version}-gcc-mp-${gcc_version_dot} ${destroot}${prefix}/bin/dragonegg-${llvm_version}-g++-mp-${gcc_version_dot}
-    ln -s dragonegg-${llvm_version}-gcc-mp-${gcc_version_dot} ${destroot}${prefix}/bin/dragonegg-${llvm_version}-gcj-mp-${gcc_version_dot}
-    ln -s dragonegg-${llvm_version}-gcc-mp-${gcc_version_dot} ${destroot}${prefix}/bin/dragonegg-${llvm_version}-gcov-mp-${gcc_version_dot}
-    ln -s dragonegg-${llvm_version}-gcc-mp-${gcc_version_dot} ${destroot}${prefix}/bin/dragonegg-${llvm_version}-gfortran-mp-${gcc_version_dot}
+    xinstall -m 755 ${filespath}/dragonegg-gcc ${destroot}${prefix}/bin/dragonegg-${llvm_version}-gcc
+    ln -s dragonegg-${llvm_version}-gcc ${destroot}${prefix}/bin/dragonegg-${llvm_version}-cpp
+    ln -s dragonegg-${llvm_version}-gcc ${destroot}${prefix}/bin/dragonegg-${llvm_version}-c++
+    ln -s dragonegg-${llvm_version}-gcc ${destroot}${prefix}/bin/dragonegg-${llvm_version}-g++
+    ln -s dragonegg-${llvm_version}-gcc ${destroot}${prefix}/bin/dragonegg-${llvm_version}-gcj
+    ln -s dragonegg-${llvm_version}-gcc ${destroot}${prefix}/bin/dragonegg-${llvm_version}-gcov
+    ln -s dragonegg-${llvm_version}-gcc ${destroot}${prefix}/bin/dragonegg-${llvm_version}-gfortran
 
-    reinplace "s:PLUGIN:${prefix}/libexec/dragonegg/llvm-${llvm_version}-gcc${gcc_version}.so:" ${destroot}${prefix}/bin/dragonegg-${llvm_version}-gcc-mp-${gcc_version_dot}
+    reinplace "s:PLUGIN:${prefix}/libexec/dragonegg/llvm-${llvm_version}-gcc${gcc_version}.so:" ${destroot}${prefix}/bin/dragonegg-${llvm_version}-gcc
+    reinplace "s:LLVM_VERSION:${llvm_version}:" ${destroot}${prefix}/bin/dragonegg-${llvm_version}-gcc
+    reinplace "s:GCC_VERSION:${gcc_version_dot}:" ${destroot}${prefix}/bin/dragonegg-${llvm_version}-gcc
 }

Modified: trunk/dports/lang/dragonegg-3.0/files/dragonegg-3.0-gcc46
===================================================================
--- trunk/dports/lang/dragonegg-3.0/files/dragonegg-3.0-gcc46	2011-12-17 10:49:29 UTC (rev 88065)
+++ trunk/dports/lang/dragonegg-3.0/files/dragonegg-3.0-gcc46	2011-12-17 10:55:29 UTC (rev 88066)
@@ -1,7 +1,7 @@
-bin/dragonegg-3.0-gcc-mp-4.6
-bin/dragonegg-3.0-cpp-mp-4.6
-bin/dragonegg-3.0-c++-mp-4.6
-bin/dragonegg-3.0-g++-mp-4.6
-bin/dragonegg-3.0-gcj-mp-4.6
-bin/dragonegg-3.0-gcov-mp-4.6
-bin/dragonegg-3.0-gfortran-mp-4.6
+bin/dragonegg-3.0-gcc
+bin/dragonegg-3.0-cpp
+bin/dragonegg-3.0-c++
+bin/dragonegg-3.0-g++
+bin/dragonegg-3.0-gcj
+bin/dragonegg-3.0-gcov
+bin/dragonegg-3.0-gfortran

Modified: trunk/dports/lang/dragonegg-3.0/files/dragonegg-gcc
===================================================================
--- trunk/dports/lang/dragonegg-3.0/files/dragonegg-gcc	2011-12-17 10:49:29 UTC (rev 88065)
+++ trunk/dports/lang/dragonegg-3.0/files/dragonegg-gcc	2011-12-17 10:55:29 UTC (rev 88066)
@@ -1,3 +1,5 @@
 #!/bin/bash
 
-exec ${0/dragonegg-3.0-/} -fplugin=PLUGIN "${@}"
+CMD=${0/dragonegg-LLVM_VERSION-/}
+
+exec ${CMD}-mp-GCC_VERSION -fplugin=PLUGIN "${@}"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111217/9ee2a60e/attachment-0001.html>