[110136] trunk/dports/lang
larryv at macports.org
larryv at macports.org
Mon Aug 26 21:40:53 PDT 2013
Revision: 110136
https://trac.macports.org/changeset/110136
Author: larryv at macports.org
Date: 2013-08-26 21:40:52 -0700 (Mon, 26 Aug 2013)
Log Message:
-----------
gcc4*: Set up "build" directory correctly.
Modified Paths:
--------------
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/lang/gcc47/Portfile
trunk/dports/lang/gcc48/Portfile
trunk/dports/lang/gcc49/Portfile
Modified: trunk/dports/lang/gcc42/Portfile
===================================================================
--- trunk/dports/lang/gcc42/Portfile 2013-08-27 03:29:38 UTC (rev 110135)
+++ trunk/dports/lang/gcc42/Portfile 2013-08-27 04:40:52 UTC (rev 110136)
@@ -48,12 +48,12 @@
set major 4.2
-worksrcdir build
+worksrcdir gcc-${version}
patch {
# fix names of infopages
foreach f { cpp cppinternals gcc gccint} {
- reinplace "s|${f}.info|${f}-mp-${version}.info|g" ${workpath}/gcc-${version}/gcc/doc/${f}.texi
+ reinplace "s|${f}.info|${f}-mp-${version}.info|g" ${worksrcpath}/gcc/doc/${f}.texi
}
}
@@ -79,10 +79,11 @@
}
pre-configure {
- file mkdir ${worksrcpath}
+ file mkdir ${configure.dir}
}
-configure.cmd ../gcc-${version}/configure
+configure.dir ${workpath}/build
+configure.cmd ${worksrcpath}/configure
configure.args --enable-languages=c,c++,java,objc,obj-c++,fortran \
--libdir=${prefix}/lib/${name} \
--includedir=${prefix}/include/${name} \
@@ -109,6 +110,7 @@
STRIP_FOR_TARGET=${prefix}/bin/strip
+build.dir ${configure.dir}
use_parallel_build yes
destroot.target install install-info-host
Modified: trunk/dports/lang/gcc43/Portfile
===================================================================
--- trunk/dports/lang/gcc43/Portfile 2013-08-27 03:29:38 UTC (rev 110135)
+++ trunk/dports/lang/gcc43/Portfile 2013-08-27 04:40:52 UTC (rev 110136)
@@ -32,7 +32,7 @@
set dobjc gcc-objc-${version}.tar.bz2
distfiles ${dcore} ${dfort} ${dcxx} ${djava} ${dobjc}
-
+
checksums gcc-core-${version}.tar.bz2 \
md5 43df9ad8b4bb314a46bac12f5aefaec2 \
sha1 d9dc274ad558194e7d9bacc49c333a4870d7e613 \
@@ -61,21 +61,17 @@
license_noconflict gmp mpfr
patchfiles Make-lang.in.diff darwin10.diff i386_multilib.diff ppc_fde_encoding.diff
-patch.dir ${workpath}/gcc-${version}
set major 4.3
-worksrcdir build
+worksrcdir gcc-${version}
-post-extract {
- file mkdir ${worksrcpath}
-}
-
platform darwin {
configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
}
-configure.cmd ../gcc-${version}/configure
+configure.dir ${workpath}/build
+configure.cmd ${worksrcpath}/configure
configure.args --enable-languages=c,c++,objc,obj-c++,java,fortran \
--libdir=${prefix}/lib/${name} \
--includedir=${prefix}/include/${name} \
@@ -110,6 +106,9 @@
pre-configure {
configure.args-append --with-pkgversion="MacPorts ${name} ${version}_${revision}${portvariants}"
+
+ # TODO: Remove when base automatically creates configure.dir (2.2.1?).
+ file mkdir ${configure.dir}
}
# http://trac.macports.org/ticket/29067
@@ -126,6 +125,7 @@
# Yes, we need to set both BOOT_CFLAGS and STAGE1_CFLAGS
# because STAGE1_CFLAGS is used with xgcc for libgcc
build.args-append BOOT_CFLAGS="-O2 -g -D_FORTIFY_SOURCE=0" STAGE1_CFLAGS="-O2 -fkeep-inline-functions -D_FORTIFY_SOURCE=0 -std=gnu89"
+build.dir ${configure.dir}
build.target bootstrap
use_parallel_build yes
Modified: trunk/dports/lang/gcc44/Portfile
===================================================================
--- trunk/dports/lang/gcc44/Portfile 2013-08-27 03:29:38 UTC (rev 110135)
+++ trunk/dports/lang/gcc44/Portfile 2013-08-27 04:40:52 UTC (rev 110136)
@@ -33,7 +33,7 @@
set dobjc gcc-objc-${version}.tar.bz2
distfiles ${dcore} ${dfort} ${dcxx} ${djava} ${dobjc}
-
+
checksums gcc-core-4.4.7.tar.bz2 \
md5 3bda0831d654964ee152c46fa8d29e46 \
sha1 6db82d9cb0c9c0bd93c80c972e8b08b8dca2455d \
@@ -62,21 +62,17 @@
license_noconflict gmp mpfr
patchfiles ppc_fde_encoding.diff
-patch.dir ${workpath}/gcc-${version}
set major 4.4
-worksrcdir build
+worksrcdir gcc-${version}
-post-extract {
- file mkdir ${worksrcpath}
-}
-
platform darwin {
configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
}
-configure.cmd ../gcc-${version}/configure
+configure.dir ${workpath}/build
+configure.cmd ${worksrcpath}/configure
configure.args --enable-languages=c,c++,objc,obj-c++,java,fortran \
--libdir=${prefix}/lib/${name} \
--includedir=${prefix}/include/${name} \
@@ -111,6 +107,9 @@
pre-configure {
configure.args-append --with-pkgversion="MacPorts ${name} ${version}_${revision}${portvariants}"
+
+ # TODO: Remove when base automatically creates configure.dir (2.2.1?).
+ file mkdir ${configure.dir}
}
# http://trac.macports.org/ticket/29067
@@ -127,6 +126,7 @@
# Yes, we need to set both BOOT_CFLAGS and STAGE1_CFLAGS
# because STAGE1_CFLAGS is used with xgcc for libgcc
build.args-append BOOT_CFLAGS="-O2 -g -D_FORTIFY_SOURCE=0" STAGE1_CFLAGS="-O2 -fkeep-inline-functions -D_FORTIFY_SOURCE=0 -std=gnu89"
+build.dir ${configure.dir}
build.target bootstrap
use_parallel_build yes
Modified: trunk/dports/lang/gcc45/Portfile
===================================================================
--- trunk/dports/lang/gcc45/Portfile 2013-08-27 03:29:38 UTC (rev 110135)
+++ trunk/dports/lang/gcc45/Portfile 2013-08-27 04:40:52 UTC (rev 110136)
@@ -43,7 +43,7 @@
distfiles ${dcore}:gcc ${dfort}:gcc ${dcxx}:gcc ${djava}:gcc ${dobjc}:gcc ${ecj}:ecj
extract.only ${dcore} ${dfort} ${dcxx} ${djava} ${dobjc}
-
+
checksums gcc-core-${version}.tar.bz2 \
rmd160 558a68fad29011b8ba04e1c103eb204bd1e54d5a \
sha256 894d90f72cbfc8707e330fa2b1847c443fa97cf9b7f26e86be554709510e624a \
@@ -70,22 +70,21 @@
license_noconflict gmp mpfr ppl libmpc
patchfiles ppc_fde_encoding.diff
-patch.dir ${workpath}/gcc-${version}
set major 4.5
-worksrcdir build
+worksrcdir gcc-${version}
post-extract {
- file mkdir ${worksrcpath}
- copy ${distpath}/${ecj} ${workpath}/gcc-${version}/ecj.jar
+ copy ${distpath}/${ecj} ${worksrcpath}/ecj.jar
}
platform darwin {
configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
}
-configure.cmd ../gcc-${version}/configure
+configure.dir ${workpath}/build
+configure.cmd ${worksrcpath}/configure
configure.args --enable-languages=c,c++,objc,obj-c++,fortran,java \
--libdir=${prefix}/lib/${name} \
--includedir=${prefix}/include/${name} \
@@ -123,6 +122,9 @@
pre-configure {
configure.args-append --with-pkgversion="MacPorts ${name} ${version}_${revision}${portvariants}"
+
+ # TODO: Remove when base automatically creates configure.dir (2.2.1?).
+ file mkdir ${configure.dir}
}
# http://trac.macports.org/ticket/29067
@@ -136,6 +138,7 @@
configure.args-append --enable-lto
}
+build.dir ${configure.dir}
build.target bootstrap
use_parallel_build yes
Modified: trunk/dports/lang/gcc46/Portfile
===================================================================
--- trunk/dports/lang/gcc46/Portfile 2013-08-27 03:29:38 UTC (rev 110135)
+++ trunk/dports/lang/gcc46/Portfile 2013-08-27 04:40:52 UTC (rev 110136)
@@ -55,22 +55,19 @@
license_noconflict gmp mpfr ppl libmpc
patchfiles gcc-4.6-cloog_lang_c.patch enable_libstdcxx_time_yes.patch
-patch.dir ${workpath}/gcc-${version}
set major 4.6
-worksrcdir build
-
post-extract {
- file mkdir ${worksrcpath}
- copy ${distpath}/${ecj} ${workpath}/${distname}/ecj.jar
+ copy ${distpath}/${ecj} ${worksrcpath}/ecj.jar
}
platform darwin {
configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
}
-configure.cmd ../gcc-${version}/configure
+configure.dir ${workpath}/build
+configure.cmd ${worksrcpath}/configure
# 'java' and 'go' lead to compilation errors on 10.5/XCode 3.x
configure.args --enable-languages=c,c++,objc,obj-c++,lto,fortran \
--libdir=${prefix}/lib/${name} \
@@ -114,6 +111,9 @@
pre-configure {
configure.args-append --with-pkgversion="MacPorts ${name} ${version}_${revision}${portvariants}"
+
+ # TODO: Remove when base automatically creates configure.dir (2.2.1?).
+ file mkdir ${configure.dir}
}
# http://trac.macports.org/ticket/29067
@@ -122,6 +122,7 @@
# http://trac.macports.org/ticket/29104
compiler.blacklist-append {llvm-gcc-4.2 < 2336.1}
+build.dir ${configure.dir}
build.target bootstrap
use_parallel_build yes
Modified: trunk/dports/lang/gcc47/Portfile
===================================================================
--- trunk/dports/lang/gcc47/Portfile 2013-08-27 03:29:38 UTC (rev 110135)
+++ trunk/dports/lang/gcc47/Portfile 2013-08-27 04:40:52 UTC (rev 110136)
@@ -55,22 +55,19 @@
license_noconflict gmp mpfr ppl libmpc
patchfiles ppc_fde_encoding.diff gcc-PR-53453.patch enable_libstdcxx_time_yes.patch
-patch.dir ${workpath}/gcc-${version}
set major 4.7
-worksrcdir build
-
post-extract {
- file mkdir ${worksrcpath}
- copy ${distpath}/${ecj} ${workpath}/${distname}/ecj.jar
+ copy ${distpath}/${ecj} ${worksrcpath}/ecj.jar
}
platform darwin {
configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
}
-configure.cmd ../gcc-${version}/configure
+configure.dir ${workpath}/build
+configure.cmd ${worksrcpath}/configure
configure.args --enable-languages=c,c++,objc,obj-c++,lto,fortran,java \
--libdir=${prefix}/lib/${name} \
--includedir=${prefix}/include/${name} \
@@ -113,6 +110,9 @@
pre-configure {
configure.args-append --with-pkgversion="MacPorts ${name} ${version}_${revision}${portvariants}"
+
+ # TODO: Remove when base automatically creates configure.dir (2.2.1?).
+ file mkdir ${configure.dir}
}
# http://trac.macports.org/ticket/29067
@@ -121,6 +121,7 @@
# http://trac.macports.org/ticket/29104
compiler.blacklist-append {llvm-gcc-4.2 < 2336.1}
+build.dir ${configure.dir}
build.target bootstrap
use_parallel_build yes
Modified: trunk/dports/lang/gcc48/Portfile
===================================================================
--- trunk/dports/lang/gcc48/Portfile 2013-08-27 03:29:38 UTC (rev 110135)
+++ trunk/dports/lang/gcc48/Portfile 2013-08-27 04:40:52 UTC (rev 110136)
@@ -40,21 +40,14 @@
depends_skip_archcheck-append gcc_select ld64 cctools
license_noconflict gmp mpfr ppl libmpc
-patch.dir ${workpath}/gcc-${version}
-
set major 4.8
-worksrcdir build
-
-post-extract {
- file mkdir ${worksrcpath}
-}
-
platform darwin {
configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
}
-configure.cmd ../gcc-${version}/configure
+configure.dir ${workpath}/build
+configure.cmd ${worksrcpath}/configure
configure.args --enable-languages=c,c++,objc,obj-c++,lto,fortran,java \
--libdir=${prefix}/lib/${name} \
--includedir=${prefix}/include/${name} \
@@ -93,6 +86,9 @@
pre-configure {
configure.args-append --with-pkgversion="MacPorts ${name} ${version}_${revision}${portvariants}"
+
+ # TODO: Remove when base automatically creates configure.dir (2.2.1?).
+ file mkdir ${configure.dir}
}
# http://trac.macports.org/ticket/29067
@@ -101,6 +97,7 @@
# http://trac.macports.org/ticket/29104
compiler.blacklist-append {llvm-gcc-4.2 < 2336.1}
+build.dir ${configure.dir}
build.target bootstrap
use_parallel_build yes
Modified: trunk/dports/lang/gcc49/Portfile
===================================================================
--- trunk/dports/lang/gcc49/Portfile 2013-08-27 03:29:38 UTC (rev 110135)
+++ trunk/dports/lang/gcc49/Portfile 2013-08-27 04:40:52 UTC (rev 110136)
@@ -41,21 +41,14 @@
depends_skip_archcheck-append gcc_select ld64 cctools
license_noconflict gmp mpfr ppl libmpc
-patch.dir ${workpath}/gcc-${version}
-
set major 4.9
-worksrcdir build
-
-post-extract {
- file mkdir ${worksrcpath}
-}
-
platform darwin {
configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
}
-configure.cmd ../gcc-${version}/configure
+configure.dir ${workpath}/build
+configure.cmd ${worksrcpath}/configure
configure.args --enable-languages=c,c++,objc,obj-c++,fortran,java \
--libdir=${prefix}/lib/${name} \
--includedir=${prefix}/include/${name} \
@@ -94,6 +87,9 @@
pre-configure {
configure.args-append --with-pkgversion="MacPorts ${name} ${version}_${revision}${portvariants}"
+
+ # TODO: Remove when base automatically creates configure.dir (2.2.1?).
+ file mkdir ${configure.dir}
}
# http://trac.macports.org/ticket/29067
@@ -102,6 +98,7 @@
# http://trac.macports.org/ticket/29104
compiler.blacklist-append {llvm-gcc-4.2 < 2336.1}
+build.dir ${configure.dir}
build.target bootstrap
use_parallel_build yes
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130826/7a57cecf/attachment.html>
More information about the macports-changes
mailing list