[108371] trunk/dports/lang
jeremyhu at macports.org
jeremyhu at macports.org
Sun Jul 21 13:58:32 PDT 2013
Revision: 108371
https://trac.macports.org/changeset/108371
Author: jeremyhu at macports.org
Date: 2013-07-21 13:58:31 -0700 (Sun, 21 Jul 2013)
Log Message:
-----------
dragonegg-3.{3,4}: Install integrated-as.specs and rename plugin for better compatibility with -fplugin
Modified Paths:
--------------
trunk/dports/lang/dragonegg-3.3/Portfile
trunk/dports/lang/dragonegg-3.4/Portfile
Modified: trunk/dports/lang/dragonegg-3.3/Portfile
===================================================================
--- trunk/dports/lang/dragonegg-3.3/Portfile 2013-07-21 18:49:12 UTC (rev 108370)
+++ trunk/dports/lang/dragonegg-3.3/Portfile 2013-07-21 20:58:31 UTC (rev 108371)
@@ -5,27 +5,28 @@
PortGroup select 1.0
set llvm_version 3.3
+set llvm_version_no_dot 33
name dragonegg-${llvm_version}
subport ${name}-gcc-4.5 {
- revision 0
- set gcc_version 45
- set gcc_version_dot 4.5
+ revision 1
+ set gcc_version 4.5
+ set gcc_version_no_dot 45
}
subport ${name}-gcc-4.6 {
- revision 0
- set gcc_version 46
- set gcc_version_dot 4.6
+ revision 1
+ set gcc_version 4.6
+ set gcc_version_no_dot 46
}
subport ${name}-gcc-4.7 {
- revision 0
- set gcc_version 47
- set gcc_version_dot 4.7
+ revision 1
+ set gcc_version 4.7
+ set gcc_version_no_dot 47
}
subport ${name}-gcc-4.8 {
- revision 0
- set gcc_version 48
- set gcc_version_dot 4.8
+ revision 1
+ set gcc_version 4.8
+ set gcc_version_no_dot 48
}
dist_subdir llvm
@@ -44,31 +45,31 @@
if {${subport} == ${name}} {
version ${llvm_version}
epoch 1
-revision 2
+revision 3
distfiles
-set gcc_version_dot 4.6
+set gcc_version 4.6
-depends_run port:${name}-gcc-${gcc_version_dot}
+depends_run port:${name}-gcc-${gcc_version}
use_configure no
build {}
destroot {
# For base
foreach binary {gcc cpp c++ g++ gcj gcov gfortran} {
- ln -s dragonegg-${llvm_version}-${binary}-mp-${gcc_version_dot} ${destroot}${prefix}/bin/dragonegg-${llvm_version}-${binary}
+ ln -s dragonegg-${llvm_version}-${binary}-mp-${gcc_version} ${destroot}${prefix}/bin/dragonegg-${llvm_version}-${binary}
}
}
} else {
-depends_lib port:llvm-${llvm_version} port:gcc${gcc_version}
+depends_lib port:llvm-${llvm_version} port:gcc${gcc_version_no_dot}
depends_run port:gcc_select
# gcc needs to match our arch, not the other way around
# We build +universal just fine in order to support whatever arch gcc is
-depends_skip_archcheck-append gcc${gcc_version}
+depends_skip_archcheck-append gcc${gcc_version_no_dot}
#fetch.type svn
#svn.revision 185261
@@ -94,7 +95,7 @@
use_configure no
select.group gcc
-select.file ${worksrcpath}/dragonegg-${llvm_version}-gcc-${gcc_version_dot}
+select.file ${worksrcpath}/dragonegg-${llvm_version}-gcc-${gcc_version}
build.target
@@ -121,7 +122,7 @@
post-extract {
file copy ${filespath}/dragonegg-select ${select.file}
reinplace "s:LLVM_VERSION:${llvm_version}:" ${select.file}
- reinplace "s:GCC_VERSION:${gcc_version_dot}:" ${select.file}
+ reinplace "s:GCC_VERSION:${gcc_version}:" ${select.file}
}
variant universal {
@@ -132,22 +133,23 @@
build.env-append \
LLVM_CONFIG=${prefix}/bin/llvm-config-mp-${llvm_version} \
- GCC=${prefix}/bin/gcc-mp-${gcc_version_dot} \
+ GCC=${prefix}/bin/gcc-mp-${gcc_version} \
CC="${configure.cc} ${configure.cppflags} [get_canonical_archflags cc]" \
CXX="${configure.cxx} ${configure.cppflags} [get_canonical_archflags cxx]"
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_dot}.so
+ xinstall -m 755 ${worksrcpath}/dragonegg.so ${destroot}${prefix}/libexec/dragonegg/llvm${llvm_version_no_dot}gcc${gcc_version_no_dot}.so
+ reinplace "s:dragonegg:llvm${llvm_version_no_dot}gcc${gcc_version_no_dot}:" ${worksrcpath}/integrated-as.specs
+ xinstall -m 644 ${worksrcpath}/integrated-as.specs ${destroot}${prefix}/libexec/dragonegg/llvm${llvm_version_no_dot}gcc${gcc_version_no_dot}-integrated-as.specs
foreach binary {gcc cpp c++ g++ gcj gcov gfortran} {
- set path ${destroot}${prefix}/bin/dragonegg-${llvm_version}-${binary}-mp-${gcc_version_dot}
+ set path ${destroot}${prefix}/bin/dragonegg-${llvm_version}-${binary}-mp-${gcc_version}
xinstall -m 755 ${filespath}/dragonegg-gcc ${path}
- reinplace "s:PLUGIN:${prefix}/libexec/dragonegg/llvm-${llvm_version}-gcc-${gcc_version_dot}.so:" ${path}
+ reinplace "s:PLUGIN:${prefix}/libexec/dragonegg/llvm${llvm_version_no_dot}gcc${gcc_version_no_dot}.so:" ${path}
reinplace "s:PREFIX:${prefix}:" ${path}
- reinplace "s:GCC_VERSION:${gcc_version_dot}:" ${path}
+ reinplace "s:GCC_VERSION:${gcc_version}:" ${path}
reinplace "s:BINARY:${binary}:" ${path}
-
}
}
Modified: trunk/dports/lang/dragonegg-3.4/Portfile
===================================================================
--- trunk/dports/lang/dragonegg-3.4/Portfile 2013-07-21 18:49:12 UTC (rev 108370)
+++ trunk/dports/lang/dragonegg-3.4/Portfile 2013-07-21 20:58:31 UTC (rev 108371)
@@ -5,32 +5,33 @@
PortGroup select 1.0
set llvm_version 3.4
+set llvm_version_no_dot 34
name dragonegg-${llvm_version}
subport ${name}-gcc-4.5 {
- revision 1
- set gcc_version 45
- set gcc_version_dot 4.5
+ revision 2
+ set gcc_version 4.5
+ set gcc_version_no_dot 45
}
subport ${name}-gcc-4.6 {
- revision 1
- set gcc_version 46
- set gcc_version_dot 4.6
+ revision 2
+ set gcc_version 4.6
+ set gcc_version_no_dot 46
}
subport ${name}-gcc-4.7 {
- revision 1
- set gcc_version 47
- set gcc_version_dot 4.7
+ revision 2
+ set gcc_version 4.7
+ set gcc_version_no_dot 47
}
subport ${name}-gcc-4.8 {
- revision 1
- set gcc_version 48
- set gcc_version_dot 4.8
+ revision 2
+ set gcc_version 4.8
+ set gcc_version_no_dot 48
}
subport ${name}-gcc-4.9 {
- revision 1
- set gcc_version 49
- set gcc_version_dot 4.9
+ revision 2
+ set gcc_version 4.9
+ set gcc_version_no_dot 49
}
dist_subdir llvm
@@ -49,30 +50,31 @@
if {${subport} == ${name}} {
version ${llvm_version}
epoch 1
+revision 1
distfiles
-set gcc_version_dot 4.6
+set gcc_version 4.6
-depends_run port:${name}-gcc-${gcc_version_dot}
+depends_run port:${name}-gcc-${gcc_version}
use_configure no
build {}
destroot {
# For base
foreach binary {gcc cpp c++ g++ gcj gcov gfortran} {
- ln -s dragonegg-${llvm_version}-${binary}-mp-${gcc_version_dot} ${destroot}${prefix}/bin/dragonegg-${llvm_version}-${binary}
+ ln -s dragonegg-${llvm_version}-${binary}-mp-${gcc_version} ${destroot}${prefix}/bin/dragonegg-${llvm_version}-${binary}
}
}
} else {
-depends_lib port:llvm-${llvm_version} port:gcc${gcc_version}
+depends_lib port:llvm-${llvm_version} port:gcc${gcc_version_no_dot}
depends_run port:gcc_select
# gcc needs to match our arch, not the other way around
# We build +universal just fine in order to support whatever arch gcc is
-depends_skip_archcheck-append gcc${gcc_version}
+depends_skip_archcheck-append gcc${gcc_version_no_dot}
fetch.type svn
svn.revision 185261
@@ -98,7 +100,7 @@
use_configure no
select.group gcc
-select.file ${worksrcpath}/dragonegg-${llvm_version}-gcc-${gcc_version_dot}
+select.file ${worksrcpath}/dragonegg-${llvm_version}-gcc-${gcc_version}
build.target
@@ -125,7 +127,7 @@
post-extract {
file copy ${filespath}/dragonegg-select ${select.file}
reinplace "s:LLVM_VERSION:${llvm_version}:" ${select.file}
- reinplace "s:GCC_VERSION:${gcc_version_dot}:" ${select.file}
+ reinplace "s:GCC_VERSION:${gcc_version}:" ${select.file}
}
variant universal {
@@ -136,22 +138,23 @@
build.env-append \
LLVM_CONFIG=${prefix}/bin/llvm-config-mp-${llvm_version} \
- GCC=${prefix}/bin/gcc-mp-${gcc_version_dot} \
+ GCC=${prefix}/bin/gcc-mp-${gcc_version} \
CC="${configure.cc} ${configure.cppflags} [get_canonical_archflags cc]" \
CXX="${configure.cxx} ${configure.cppflags} [get_canonical_archflags cxx]"
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_dot}.so
+ xinstall -m 755 ${worksrcpath}/dragonegg.so ${destroot}${prefix}/libexec/dragonegg/llvm${llvm_version_no_dot}gcc${gcc_version_no_dot}.so
+ reinplace "s:dragonegg:llvm${llvm_version_no_dot}gcc${gcc_version_no_dot}:" ${worksrcpath}/integrated-as.specs
+ xinstall -m 644 ${worksrcpath}/integrated-as.specs ${destroot}${prefix}/libexec/dragonegg/llvm${llvm_version_no_dot}gcc${gcc_version_no_dot}-integrated-as.specs
foreach binary {gcc cpp c++ g++ gcj gcov gfortran} {
- set path ${destroot}${prefix}/bin/dragonegg-${llvm_version}-${binary}-mp-${gcc_version_dot}
+ set path ${destroot}${prefix}/bin/dragonegg-${llvm_version}-${binary}-mp-${gcc_version}
xinstall -m 755 ${filespath}/dragonegg-gcc ${path}
- reinplace "s:PLUGIN:${prefix}/libexec/dragonegg/llvm-${llvm_version}-gcc-${gcc_version_dot}.so:" ${path}
+ reinplace "s:PLUGIN:${prefix}/libexec/dragonegg/llvm${llvm_version_no_dot}gcc${gcc_version_no_dot}.so:" ${path}
reinplace "s:PREFIX:${prefix}:" ${path}
- reinplace "s:GCC_VERSION:${gcc_version_dot}:" ${path}
+ reinplace "s:GCC_VERSION:${gcc_version}:" ${path}
reinplace "s:BINARY:${binary}:" ${path}
-
}
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130721/4c9a6af9/attachment.html>
More information about the macports-changes
mailing list