[78606] trunk/dports
jmr at macports.org
jmr at macports.org
Fri May 13 21:58:01 PDT 2011
Revision: 78606
http://trac.macports.org/changeset/78606
Author: jmr at macports.org
Date: 2011-05-13 21:58:01 -0700 (Fri, 13 May 2011)
Log Message:
-----------
gcc ports:
* use select portgroup (#24924)
* depend on gcc_select for base select files (#19126, no rev bump as this is more of a recommendation than a dependency)
Modified Paths:
--------------
trunk/dports/_resources/port1.0/group/select-1.0.tcl
trunk/dports/lang/gcc41/Portfile
trunk/dports/lang/gcc42/Portfile
trunk/dports/lang/gcc43/Portfile
trunk/dports/lang/gcc44/Portfile
trunk/dports/lang/gcc45/Portfile
trunk/dports/lang/gcc46/Portfile
trunk/dports/sysutils/gcc_select/Portfile
trunk/dports/sysutils/gcc_select/files/llvm-gcc42
Added Paths:
-----------
trunk/dports/sysutils/gcc_select/files/none
Modified: trunk/dports/_resources/port1.0/group/select-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/select-1.0.tcl 2011-05-14 01:10:29 UTC (rev 78605)
+++ trunk/dports/_resources/port1.0/group/select-1.0.tcl 2011-05-14 04:58:01 UTC (rev 78606)
@@ -41,7 +41,7 @@
namespace eval select {}
proc select::install {group file} {
- global prefix destroot frameworks_dir applications_dir
+ global prefix destroot frameworks_dir applications_dir developer_dir
xinstall -m 755 -d ${destroot}${prefix}/etc/select/${group}
xinstall -m 644 ${file} ${destroot}${prefix}/etc/select/${group}
@@ -49,6 +49,7 @@
reinplace s|\${prefix}|${prefix}|g ${destroot}${prefix}/etc/select/${group}/[file tail ${file}]
reinplace s|\${frameworks_dir}|${frameworks_dir}|g ${destroot}${prefix}/etc/select/${group}/[file tail ${file}]
reinplace s|\${applications_dir}|${applications_dir}|g ${destroot}${prefix}/etc/select/${group}/[file tail ${file}]
+ reinplace s|\${developer_dir}|${developer_dir}|g ${destroot}${prefix}/etc/select/${group}/[file tail ${file}]
}
post-destroot {
Modified: trunk/dports/lang/gcc41/Portfile
===================================================================
--- trunk/dports/lang/gcc41/Portfile 2011-05-14 01:10:29 UTC (rev 78605)
+++ trunk/dports/lang/gcc41/Portfile 2011-05-14 04:58:01 UTC (rev 78606)
@@ -1,6 +1,7 @@
# $Id$
PortSystem 1.0
+PortGroup select 1.0
name gcc41
version 4.1.2
@@ -42,6 +43,7 @@
use_bzip2 yes
depends_lib port:gmp port:mpfr port:libiconv
+depends_run port:gcc_select
set major 4.1
@@ -99,11 +101,11 @@
if {![catch {set ffitarget.h [glob ${destroot}${prefix}/lib/${name}/gcc/*/${version}/include/ffitarget.h]} result]} {
file copy ${ffitarget.h} ${destroot}${prefix}/include/${name}/
}
-
- xinstall -m 755 -d ${destroot}${prefix}/etc/select/gcc
- xinstall -m 444 ${filespath}/mp-gcc41 ${destroot}${prefix}/etc/select/gcc/
}
+select.group gcc
+select.file ${filespath}/mp-${name}
+
platform darwin 9 {
patchfiles-append patch-make-exports.pl-leopard.diff
# Workaround for libiconv on Mac OS X 10.5 Leopard: force configure
Modified: trunk/dports/lang/gcc42/Portfile
===================================================================
--- trunk/dports/lang/gcc42/Portfile 2011-05-14 01:10:29 UTC (rev 78605)
+++ trunk/dports/lang/gcc42/Portfile 2011-05-14 04:58:01 UTC (rev 78606)
@@ -1,6 +1,7 @@
# $Id$
PortSystem 1.0
+PortGroup select 1.0
name gcc42
version 4.2.4
@@ -39,6 +40,7 @@
universal_variant no
depends_lib port:gmp port:mpfr port:libiconv
+depends_run port:gcc_select
set major 4.2
@@ -110,10 +112,11 @@
if {![catch {set ffitarget.h [glob ${destroot}${prefix}/lib/${name}/gcc/*/${version}/include/ffitarget.h]} result]} {
file copy ${ffitarget.h} ${destroot}${prefix}/include/${name}/
}
- xinstall -m 755 -d ${destroot}${prefix}/etc/select/gcc
- xinstall -m 444 ${filespath}/mp-gcc42 ${destroot}${prefix}/etc/select/gcc/
}
+select.group gcc
+select.file ${filespath}/mp-${name}
+
# odcctools currently do not compile for x64 - move to variant for the time being
variant odcctools {
depends_lib-append bin:odas:odcctools
Modified: trunk/dports/lang/gcc43/Portfile
===================================================================
--- trunk/dports/lang/gcc43/Portfile 2011-05-14 01:10:29 UTC (rev 78605)
+++ trunk/dports/lang/gcc43/Portfile 2011-05-14 04:58:01 UTC (rev 78606)
@@ -2,6 +2,7 @@
# $Id$
PortSystem 1.0
+PortGroup select 1.0
name gcc43
version 4.3.5
@@ -52,6 +53,7 @@
use_bzip2 yes
depends_lib port:gmp port:mpfr port:libiconv
+depends_run port:gcc_select
patchfiles Make-lang.in.diff darwin10.diff i386_multilib.diff
patch.dir ${workpath}/gcc-${version}
@@ -111,11 +113,11 @@
if {![catch {set ffitarget.h [glob ${destroot}${prefix}/lib/${name}/gcc/*/${version}/include/ffitarget.h]} result]} {
file copy ${ffitarget.h} ${destroot}${prefix}/include/${name}/
}
- # install select file for gcc_select
- xinstall -m 755 -d ${destroot}${prefix}/etc/select/gcc
- xinstall -m 444 ${filespath}/mp-gcc43 ${destroot}${prefix}/etc/select/gcc/
}
+select.group gcc
+select.file ${filespath}/mp-${name}
+
# Java support does not compile on 10.4/x86
platform darwin 8 i386 {
configure.args-delete --enable-languages=c,c++,objc,obj-c++,java,fortran
Modified: trunk/dports/lang/gcc44/Portfile
===================================================================
--- trunk/dports/lang/gcc44/Portfile 2011-05-14 01:10:29 UTC (rev 78605)
+++ trunk/dports/lang/gcc44/Portfile 2011-05-14 04:58:01 UTC (rev 78606)
@@ -1,6 +1,7 @@
# $Id$
PortSystem 1.0
+PortGroup select 1.0
name gcc44
epoch 1
@@ -51,6 +52,7 @@
use_bzip2 yes
depends_lib port:gmp port:mpfr port:libiconv
+depends_run port:gcc_select
patch.dir ${workpath}/gcc-${version}
@@ -107,15 +109,15 @@
if {![catch {set ffitarget.h [glob ${destroot}${prefix}/lib/${name}/gcc/*/${version}/include/ffitarget.h]} result]} {
file copy ${ffitarget.h} ${destroot}${prefix}/include/${name}/
}
- # install select file for gcc_select
- xinstall -m 755 -d ${destroot}${prefix}/etc/select/gcc
- xinstall -m 444 ${filespath}/mp-gcc44 ${destroot}${prefix}/etc/select/gcc/
file rename ${destroot}${prefix}/share/python/aotcompile.py \
${destroot}${prefix}/share/python/aotcompile-44.py
file rename ${destroot}${prefix}/share/python/classfile.py \
${destroot}${prefix}/share/python/classfile-44.py
}
+select.group gcc
+select.file ${filespath}/mp-${name}
+
platform darwin 10 {
configure.args-append --enable-fully-dynamic-string
}
Modified: trunk/dports/lang/gcc45/Portfile
===================================================================
--- trunk/dports/lang/gcc45/Portfile 2011-05-14 01:10:29 UTC (rev 78605)
+++ trunk/dports/lang/gcc45/Portfile 2011-05-14 04:58:01 UTC (rev 78606)
@@ -1,6 +1,7 @@
# $Id$
PortSystem 1.0
+PortGroup select 1.0
name gcc45
epoch 1
@@ -61,6 +62,7 @@
use_bzip2 yes
depends_lib port:gmp port:mpfr port:libiconv port:libmpc
+depends_run port:gcc_select
set major 4.5
@@ -121,15 +123,15 @@
if {![catch {set ffitarget.h [glob ${destroot}${prefix}/lib/${name}/gcc/*/${version}/include/ffitarget.h]} result]} {
file copy ${ffitarget.h} ${destroot}${prefix}/include/${name}/
}
- # install select file for gcc_select
- xinstall -m 755 -d ${destroot}${prefix}/etc/select/gcc
- xinstall -m 444 ${filespath}/mp-gcc45 ${destroot}${prefix}/etc/select/gcc/
file rename ${destroot}${prefix}/share/python/aotcompile.py \
${destroot}${prefix}/share/python/aotcompile-45.py
file rename ${destroot}${prefix}/share/python/classfile.py \
${destroot}${prefix}/share/python/classfile-45.py
}
+select.group gcc
+select.file ${filespath}/mp-${name}
+
platform darwin 8 {
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=45248
configure.args-append --with-dwarf2
Modified: trunk/dports/lang/gcc46/Portfile
===================================================================
--- trunk/dports/lang/gcc46/Portfile 2011-05-14 01:10:29 UTC (rev 78605)
+++ trunk/dports/lang/gcc46/Portfile 2011-05-14 04:58:01 UTC (rev 78606)
@@ -1,6 +1,7 @@
# $Id$
PortSystem 1.0
+PortGroup select 1.0
name gcc46
version 4.6-20110325
@@ -61,6 +62,7 @@
use_bzip2 yes
depends_lib port:gmp port:mpfr port:libiconv port:libmpc
+depends_run port:gcc_select
set major 4.6
@@ -118,11 +120,11 @@
if {![catch {set ffitarget.h [glob ${destroot}${prefix}/lib/${name}/gcc/*/${version}/include/ffitarget.h]} result]} {
file copy ${ffitarget.h} ${destroot}${prefix}/include/${name}/
}
- # install select file for gcc_select
- xinstall -m 755 -d ${destroot}${prefix}/etc/select/gcc
- xinstall -m 444 ${filespath}/mp-gcc46 ${destroot}${prefix}/etc/select/gcc/
}
+select.group gcc
+select.file ${filespath}/mp-${name}
+
platform darwin 10 {
configure.args-append --enable-fully-dynamic-string
}
Modified: trunk/dports/sysutils/gcc_select/Portfile
===================================================================
--- trunk/dports/sysutils/gcc_select/Portfile 2011-05-14 01:10:29 UTC (rev 78605)
+++ trunk/dports/sysutils/gcc_select/Portfile 2011-05-14 04:58:01 UTC (rev 78606)
@@ -1,66 +1,71 @@
# $Id$
PortSystem 1.0
+PortGroup select 1.0
name gcc_select
version 0.1
-revision 4
+revision 5
categories sysutils
platforms darwin
license BSD
maintainers mww
supported_archs noarch
-description Switch the default compiler
-long_description gcc_select lets you switch the default compiler. \
+description common files for selecting default gcc version
+long_description gcc_select installs files that allow 'port select' to \
+ switch the default version of gcc. \
It symlinks the standard compiler executables \
in the MacPorts prefix to the selected version.
-homepage http://svn.macports.org/repository/macports/contrib/select/
-master_sites ${homepage}
-distname select-${version}
-checksums sha1 18e1f95c2ddd88210aa52eb696261859af2dc3a4
+homepage http://www.macports.org/
+distfiles
-configure.args --mandir=${prefix}/share/man --name=gcc
-
-post-destroot {
- xinstall -m 644 -W ${filespath} base \
- ${destroot}${prefix}/etc/select/gcc
+use_configure no
+build {}
+destroot {
+ select::install gcc ${filespath}/base
+ select::install gcc ${filespath}/none
}
-# install gcc33, gcc40 & select gcc40
+# install gcc33, gcc40
platform darwin 8 powerpc {
post-destroot {
- xinstall -m 644 -W ${filespath} gcc40 gcc33 \
- ${destroot}${prefix}/etc/select/gcc
- system "${destroot}${prefix}/bin/${name} -i ${destroot} gcc40"
+ select::install gcc ${filespath}/gcc33
+ select::install gcc ${filespath}/gcc40
}
}
-# install & select gcc40
+# install gcc40
platform darwin 8 i386 {
post-destroot {
- xinstall -m 644 -W ${filespath} gcc40 \
- ${destroot}${prefix}/etc/select/gcc
- system "${destroot}${prefix}/bin/${name} -i ${destroot} gcc40"
+ select::install gcc ${filespath}/gcc40
}
}
-# install & select gcc40
+# install gcc40, gcc42, llvm-gcc42
platform darwin 9 {
post-destroot {
- xinstall -m 644 -W ${filespath} gcc40 gcc42 llvm-gcc42 \
- ${destroot}${prefix}/etc/select/gcc
- system "${destroot}${prefix}/bin/${name} -i ${destroot} gcc40"
+ select::install gcc ${filespath}/gcc40
+ select::install gcc ${filespath}/gcc42
+ select::install gcc ${filespath}/llvm-gcc42
}
}
-# install & select gcc42
+# install gcc40, gcc42, llvm-gcc42
platform darwin 10 {
post-destroot {
- xinstall -m 644 -W ${filespath} gcc40 gcc42 llvm-gcc42 \
- ${destroot}${prefix}/etc/select/gcc
- system "${destroot}${prefix}/bin/${name} -i ${destroot} gcc42"
+ select::install gcc ${filespath}/gcc40
+ select::install gcc ${filespath}/gcc42
+ select::install gcc ${filespath}/llvm-gcc42
}
}
+# install gcc42, llvm-gcc42
+platform darwin 11 {
+ post-destroot {
+ select::install gcc ${filespath}/gcc42
+ select::install gcc ${filespath}/llvm-gcc42
+ }
+}
+
livecheck.type none
Modified: trunk/dports/sysutils/gcc_select/files/llvm-gcc42
===================================================================
--- trunk/dports/sysutils/gcc_select/files/llvm-gcc42 2011-05-14 01:10:29 UTC (rev 78605)
+++ trunk/dports/sysutils/gcc_select/files/llvm-gcc42 2011-05-14 04:58:01 UTC (rev 78606)
@@ -1,7 +1,7 @@
-/Developer/usr/bin/llvm-gcc-4.2
-/Developer/usr/bin/llvm-cpp-4.2
-/Developer/usr/bin/llvm-g++-4.2
-/Developer/usr/bin/llvm-g++-4.2
+${developer_dir}/usr/bin/llvm-gcc-4.2
+${developer_dir}/usr/bin/llvm-cpp-4.2
+${developer_dir}/usr/bin/llvm-g++-4.2
+${developer_dir}/usr/bin/llvm-g++-4.2
-
-/Developer/usr/bin/gcov-4.2
+${developer_dir}/usr/bin/gcov-4.2
-
Added: trunk/dports/sysutils/gcc_select/files/none
===================================================================
--- trunk/dports/sysutils/gcc_select/files/none (rev 0)
+++ trunk/dports/sysutils/gcc_select/files/none 2011-05-14 04:58:01 UTC (rev 78606)
@@ -0,0 +1,7 @@
+-
+-
+-
+-
+-
+-
+-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110513/e2fe6385/attachment-0001.html>
More information about the macports-changes
mailing list