[95459] users/krischik

krischik at macports.org krischik at macports.org
Fri Jul 13 03:34:32 PDT 2012


Revision: 95459
          https://trac.macports.org/changeset/95459
Author:   krischik at macports.org
Date:     2012-07-13 03:34:31 -0700 (Fri, 13 Jul 2012)
Log Message:
-----------
Archive test version.

Modified Paths:
--------------
    users/krischik/gnat-gcc-4.7/Portfile

Added Paths:
-----------
    users/krischik/gnat-gcc-4.7/
    users/krischik/gnat-gcc-4.7/files/ppc_fde_encoding.diff
    users/krischik/gnat-gcc-4.7/test.command
    users/krischik/gnat-gcc-4.7/test2.command

Modified: users/krischik/gnat-gcc-4.7/Portfile
===================================================================
--- trunk/dports/lang/gnat-gcc/Portfile	2012-07-10 18:35:50 UTC (rev 95361)
+++ users/krischik/gnat-gcc-4.7/Portfile	2012-07-13 10:34:31 UTC (rev 95459)
@@ -2,307 +2,343 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup select 1.0
 
-name			gnat-gcc
-epoch			1
-version			4.4.2
-revision		1
-platforms		darwin
-categories		lang
-maintainers		krischik
-license			GPL-3
-description		The GNU compiler collection with GNAT
-long_description	The GNU compiler collection, including front ends for \
-			C, C++, Ada, Objective-C, Objective-C++, Java and Fortran95.
+name                gnat-gcc
+epoch               1
+version             4.7.1
+revision            0
+platforms           darwin
+categories          lang
+maintainers         krischik openmaintainer
+license             GPL-3
+description         The GNU compiler collection with GNAT
+long_description    The GNU compiler collection, including front ends for \
+                    C, C++, Ada, Objective-C, Objective-C++, Java and Fortran95.
 
-homepage		http://gcc.gnu.org/
-master_sites	ftp://ftp.funet.fi/pub/mirrors/sources.redhat.com/pub/gcc/releases/gcc-${version}/ \
-		ftp://ftp.gwdg.de/pub/linux/gcc/releases/gcc-${version}/ \
-		ftp://gcc.ftp.nluug.nl/mirror/languages/gcc/releases/gcc-${version}/ \
-		ftp://gcc.gnu.org/pub/gcc/releases/gcc-${version}/ \
-		gnu:/gcc/gcc-${version}
+homepage            http://gcc.gnu.org/
+master_sites        ftp://ftp.funet.fi/pub/mirrors/sources.redhat.com/pub/gcc/releases/gcc-${version}/:gcc \
+                    ftp://ftp.gwdg.de/pub/linux/gcc/releases/gcc-${version}/:gcc \
+                    ftp://gcc.ftp.nluug.nl/mirror/languages/gcc/releases/gcc-${version}/:gcc \
+                    ftp://gcc.gnu.org/pub/gcc/releases/gcc-${version}/:gcc \
+                    gnu:gcc/gcc-${version}:gcc \
+                    ftp://sourceware.org/pub/java/:ecj \
+                    http://mirrors.kernel.org/sources.redhat.com/java/:ecj \
+                    http://www.mirrorservice.org/sites/sources.redhat.com/pub/java/:ecj \
+                    http://ftp-stud.fht-esslingen.de/pub/Mirrors/sourceware.org/java/:ecj
 
-set dcore		gcc-core-${version}.tar.bz2
-set dada		gcc-ada-${version}.tar.bz2
-set dfort		gcc-fortran-${version}.tar.bz2
-set dcxx		gcc-g++-${version}.tar.bz2
-set djava		gcc-java-${version}.tar.bz2
-set dobjc		gcc-objc-${version}.tar.bz2
-distfiles		${dcore} ${dada} ${dfort} ${dcxx} ${djava} ${dobjc}
+use_bzip2           yes
 
-checksums		${dcore} sha1 929d560e07082d790de5cdc46a78008f7a742241 \
-			${dada}  sha1 75d6789299b582f043454ae70ae1aec76c1f5eb1 \
-			${dfort} sha1 bce411a96682627416311cd42134b449bdee6d81 \
-			${dcxx} sha1 e73c1dcfdefb0972a4c91c656980bdc009196ae4 \
-			${djava} sha1 f9ab2f157bd11ed56dddfc683fe022474ac11217 \
-			${dobjc} sha1 b3129d55058960d4c20fc9a2e96254e1c8c9debf
+set ecj             ecj-4.5.jar
 
-use_bzip2		yes
+distname            gcc-${version}
 
-# gmp and mpfr are not universal
-universal_variant       no
+distfiles           [suffix ${distname}]:gcc ${ecj}:ecj
 
-depends_lib		port:gmp port:mpfr port:libiconv
-depends_run             port:gcc_select
+extract.only        [suffix ${distname}]
 
-patch.dir       ${workpath}/gcc-${version}
+checksums           [suffix ${distname}] \
+                    rmd160  4b52d867d06288a0b3bb33c845cac0112c22b513 \
+                    sha256  16093f6fa01732adf378d97fe338f113c933bdf56da22bf87c76beff13da406f \
+                    ${ecj} \
+                    rmd160  d3f4da657f086b6423f74e93f001132f4855368a \
+                    sha256  98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781
 
-set major		4.4
+depends_lib         port:gmp port:mpfr port:libiconv port:libmpc port:ppl port:cloog
+depends_run         port:gcc_select port:ld64 port:cctools
 
-worksrcdir		build
-dist_subdir		gcc44
+depends_skip_archcheck-append gcc_select ld64 cctools
 
-# the generated compiler doesn't accept -arch
-if {[info exists build_arch] && ${os.platform} == "darwin"} {
-    configure.cc_archflags
-    configure.cxx_archflags
-    configure.objc_archflags
+patchfiles          ppc_fde_encoding.diff
+patch.dir           ${workpath}/gcc-${version}
+
+set major           4.7
+
+worksrcdir          build
+dist_subdir         gcc46
+
+post-extract {
+    file mkdir ${worksrcpath}
+    copy ${distpath}/${ecj} ${workpath}/gcc-${version}/ecj.jar
+}
+
+platform darwin {
     configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
 }
 
-post-extract {
-	file mkdir ${worksrcpath}
+configure.cmd       ../gcc-${version}/configure
+configure.args      --enable-languages=c,c++,ada,objc,obj-c++,java,fortran \
+                    --libdir=${prefix}/lib/${name} \
+                    --includedir=${prefix}/include/${name} \
+                    --infodir=${prefix}/share/info \
+                    --mandir=${prefix}/share/man \
+                    --datarootdir=${prefix}/share/gcc-${major} \
+                    --with-libiconv-prefix=${prefix} \
+                    --with-local-prefix=${prefix} \
+                    --with-system-zlib \
+                    --disable-nls \
+                    --program-suffix=-gnat-${major} \
+                    --with-gxx-include-dir=${prefix}/include/${name}/c++/ \
+                    --with-gmp=${prefix} \
+                    --with-mpfr=${prefix} \
+                    --with-mpc=${prefix} \
+                    --with-ppl=${prefix} \
+                    --with-cloog=${prefix} --enable-cloog-backend=isl \
+                    --enable-stage1-checking \
+                    --disable-multilib \
+                    --enable-lto \
+                    --with-as=${prefix}/bin/as \
+                    --with-ld=${prefix}/bin/ld \
+                    --with-ar=${prefix}/bin/ar \
+                    --with-bugurl=https://trac.macports.org/newticket
+
+configure.env-append \
+                    AR_FOR_TARGET=${prefix}/bin/ar \
+                    AS_FOR_TARGET=${prefix}/bin/as \
+                    LD_FOR_TARGET=${prefix}/bin/ld \
+                    NM_FOR_TARGET=${prefix}/bin/nm \
+                    OBJDUMP_FOR_TARGET=${prefix}/bin/objdump \
+                    RANLIB_FOR_TARGET=${prefix}/bin/ranlib \
+                    STRIP_FOR_TARGET=${prefix}/bin/strip \
+                    OTOOL=${prefix}/bin/otool \
+                    OTOOL64=${prefix}/bin/otool
+
+pre-configure {
+    configure.args-append --with-pkgversion="MacPorts ${name} ${version}_${revision}${portvariants}"
 }
 
-configure.cmd	../gcc-${version}/configure
-configure.args	--enable-languages=c,c++,ada,objc,obj-c++,java,fortran \
-		--libdir=${prefix}/lib/${name} \
-		--includedir=${prefix}/include/${name} \
-		--infodir=${prefix}/share/info \
-		--mandir=${prefix}/share/man \
-		--with-local-prefix=${prefix} \
-		--with-system-zlib \
-		--disable-nls \
-		--program-suffix=-gnat-${major} \
-		--with-gxx-include-dir=${prefix}/include/${name}/c++/ \
-		--with-gmp=${prefix} \
-		--with-mpfr=${prefix}
-# do NOT use MacPorts binutils -- they do not work
-configure.env-append	AR_FOR_TARGET=/usr/bin/ar \
-			AS_FOR_TARGET=/usr/bin/as \
-			LD_FOR_TARGET=/usr/bin/ld \
-			NM_FOR_TARGET=/usr/bin/nm \
-			OBJDUMP_FOR_TARGET=/usr/bin/objdump \
-			RANLIB_FOR_TARGET=/usr/bin/ranlib \
-			STRIP_FOR_TARGET=/usr/bin/strip
+# http://trac.macports.org/ticket/29104
+if {${configure.compiler} == "llvm-gcc-4.2"} {
+    configure.compiler clang
+}
 
-build.target	bootstrap
-use_parallel_build	yes
+build.target        bootstrap
+use_parallel_build  yes
 
-destroot.target install install-info-host
+destroot.target     install install-info-host
 
 post-destroot {
-	file delete -force ${destroot}${prefix}/share/man/man7 \
-		${destroot}${prefix}/share/info
-	# install/copy ffitarget.h only if we have it
-	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}/gnat-gcc ${destroot}${prefix}/etc/select/gcc/
+    file delete -force ${destroot}${prefix}/share/man/man7 \
+        ${destroot}${prefix}/share/info
+    # install/copy ffitarget.h only if we have it
+    if {![catch {set ffitarget.h [glob ${destroot}${prefix}/lib/${name}/gcc/*/${version}/include/ffitarget.h]} result]} {
+        file copy ${ffitarget.h} ${destroot}${prefix}/include/${name}/
+    }
 
-    set dest_src_dir	${destroot}${prefix}/src/gnat
-    set src_ada_dir	${workpath}/gcc-${version}/gcc/ada
-    set src_c_dir	${workpath}/gcc-${version}/gcc
-    set target_ada_dir	${workpath}/${worksrcdir}/gcc/ada;
+    # install select file for gcc_select
+    xinstall -m 755 -d ${destroot}${prefix}/etc/select/gcc
+    xinstall -m 444 ${filespath}/gnat-gcc ${destroot}${prefix}/etc/select/gcc/
 
-    xinstall -m 775 -d							${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 ali.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 ali.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 alloc.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 atree.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 atree.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 butil.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 butil.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 casing.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 casing.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 csets.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 csets.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 debug.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 debug.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 einfo.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 einfo.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 elists.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 elists.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 err_vars.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 errout.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 errout.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 erroutc.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 erroutc.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 errutil.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 errutil.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 fmap.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 fmap.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 fname.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 fname.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 g-string.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 g-string.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 gnatvsn.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 gnatvsn.ads			${dest_src_dir}
-    #xinstall -m 664 -W ${src_ada_dir}	 gprmake.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 hostparm.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 impunit.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 krunch.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 krunch.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 lib-list.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 lib-sort.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 lib.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 lib.ads			${dest_src_dir}
-    #xinstall -m 664 -W ${src_ada_dir}	 makegpr.adb			${dest_src_dir}
-    #xinstall -m 664 -W ${src_ada_dir}	 makegpr.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 makeutl.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 makeutl.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 mlib-fil.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 mlib-fil.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 mlib-tgt-specific-darwin.adb	${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 mlib-tgt-specific-linux.adb	${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 mlib-tgt-specific-mingw.adb	${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 mlib-tgt-specific.adb		${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 mlib-tgt-specific.ads		${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 mlib-tgt.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 mlib-tgt.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 mlib-utl.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 mlib-utl.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 mlib.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 mlib.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 namet.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 namet.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 nlists.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 nlists.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 opt.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 opt.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 osint.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 osint.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 output.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 output.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-attr-pm.adb		${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-attr-pm.ads		${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-attr.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-attr.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-com.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-dect.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-dect.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-env.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-env.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-err.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-err.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-ext.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-ext.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-nmsc.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-nmsc.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-pars.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-pars.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-part.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-part.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-pp.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-pp.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-proc.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-proc.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-strt.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-strt.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-tree.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-tree.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-util.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj-util.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 prj.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 repinfo.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 repinfo.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 rident.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 scans.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 scans.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 scng.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 scng.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 sdefault.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 sinfo-cn.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 sinfo-cn.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 sinfo.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 sinfo.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 sinput-c.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 sinput-c.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 sinput-p.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 sinput-p.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 sinput.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 sinput.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 snames.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 snames.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 stand.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 stand.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 stringt.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 stringt.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 style.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 styleg-c.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 styleg-c.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 styleg.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 styleg.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 stylesw.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 stylesw.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 switch-m.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 switch-m.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 switch.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 switch.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 table.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 table.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 targparm.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 targparm.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 tempdir.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 tempdir.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 tree_in.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 tree_in.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 tree_io.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 tree_io.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 types.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 types.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 uintp.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 uintp.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 uname.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 uname.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 urealp.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 urealp.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 widechar.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 widechar.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 g-comlin.ads			${dest_src_dir}
-    xinstall -m 664 -W ${src_ada_dir}	 g-comlin.adb			${dest_src_dir}
-    xinstall -m 664 -W ${src_c_dir}	 version.c			${dest_src_dir}
-    xinstall -m 664 -W ${src_c_dir}	 version.h			${dest_src_dir}
-    xinstall -m 664 -W ${target_ada_dir} sdefault.adb			${dest_src_dir}
+    set dest_src_dir    ${destroot}${prefix}/src/gnat
+    set src_ada_dir     ${workpath}/gcc-${version}/gcc/ada
+    set src_c_dir       ${workpath}/gcc-${version}/gcc
+    set target_ada_dir  ${workpath}/${worksrcdir}/gcc/ada;
+
+    xinstall -m 775 -d                                                  ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    ali.adb                        ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    ali.ads                        ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    alloc.ads                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    atree.adb                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    atree.ads                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    butil.adb                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    butil.ads                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    casing.adb                     ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    casing.ads                     ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    csets.adb                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    csets.ads                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    debug.adb                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    debug.ads                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    einfo.adb                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    einfo.ads                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    elists.adb                     ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    elists.ads                     ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    err_vars.ads                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    errout.adb                     ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    errout.ads                     ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    erroutc.adb                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    erroutc.ads                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    errutil.adb                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    errutil.ads                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    fmap.adb                       ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    fmap.ads                       ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    fname.adb                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    fname.ads                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    g-string.adb                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    g-string.ads                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    gnatvsn.adb                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    gnatvsn.ads                    ${dest_src_dir}
+    #xinstall -m 664 -W ${src_ada_dir}   gprmake.adb                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    hostparm.ads                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    impunit.adb                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    krunch.adb                     ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    krunch.ads                     ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    lib-list.adb                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    lib-sort.adb                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    lib.adb                        ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    lib.ads                        ${dest_src_dir}
+    #xinstall -m 664 -W ${src_ada_dir}   makegpr.adb                    ${dest_src_dir}
+    #xinstall -m 664 -W ${src_ada_dir}   makegpr.ads                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    makeutl.adb                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    makeutl.ads                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    mlib-fil.adb                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    mlib-fil.ads                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    mlib-tgt-specific-darwin.adb   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    mlib-tgt-specific-linux.adb    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    mlib-tgt-specific-mingw.adb    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    mlib-tgt-specific.adb          ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    mlib-tgt-specific.ads          ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    mlib-tgt.adb                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    mlib-tgt.ads                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    mlib-utl.adb                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    mlib-utl.ads                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    mlib.adb                       ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    mlib.ads                       ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    namet.adb                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    namet.ads                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    nlists.adb                     ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    nlists.ads                     ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    opt.adb                        ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    opt.ads                        ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    osint.adb                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    osint.ads                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    output.adb                     ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    output.ads                     ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-attr-pm.adb                ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-attr-pm.ads                ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-attr.adb                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-attr.ads                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-com.ads                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-dect.adb                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-dect.ads                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-env.adb                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-env.ads                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-err.adb                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-err.ads                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-ext.adb                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-ext.ads                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-nmsc.adb                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-nmsc.ads                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-pars.adb                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-pars.ads                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-part.adb                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-part.ads                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-pp.adb                     ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-pp.ads                     ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-proc.adb                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-proc.ads                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-strt.adb                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-strt.ads                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-tree.adb                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-tree.ads                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-util.adb                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj-util.ads                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj.adb                        ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    prj.ads                        ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    repinfo.adb                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    repinfo.ads                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    rident.ads                     ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    scans.adb                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    scans.ads                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    scng.adb                       ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    scng.ads                       ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    sdefault.ads                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    sinfo-cn.adb                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    sinfo-cn.ads                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    sinfo.adb                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    sinfo.ads                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    sinput-c.adb                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    sinput-c.ads                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    sinput-p.adb                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    sinput-p.ads                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    sinput.adb                     ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    sinput.ads                     ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    snames.adb                     ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    snames.ads                     ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    stand.adb                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    stand.ads                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    stringt.adb                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    stringt.ads                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    style.ads                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    styleg-c.adb                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    styleg-c.ads                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    styleg.adb                     ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    styleg.ads                     ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    stylesw.adb                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    stylesw.ads                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    switch-m.adb                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    switch-m.ads                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    switch.adb                     ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    switch.ads                     ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    table.adb                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    table.ads                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    targparm.adb                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    targparm.ads                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    tempdir.adb                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    tempdir.ads                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    tree_in.adb                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    tree_in.ads                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    tree_io.adb                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    tree_io.ads                    ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    types.adb                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    types.ads                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    uintp.adb                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    uintp.ads                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    uname.adb                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    uname.ads                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    urealp.adb                     ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    urealp.ads                     ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    widechar.adb                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    widechar.ads                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    g-comlin.ads                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_ada_dir}    g-comlin.adb                   ${dest_src_dir}
+    xinstall -m 664 -W ${src_c_dir}      version.c                      ${dest_src_dir}
+    xinstall -m 664 -W ${src_c_dir}      version.h                      ${dest_src_dir}
+    xinstall -m 664 -W ${target_ada_dir} sdefault.adb                   ${dest_src_dir}
 }
 
+select.group        gcc
+select.file         ${filespath}/gnat-${name}
+
 platform powerpc {
-	configure.args-append --disable-multilib
+    configure.universal_archs ppc ppc64
 }
-
-# odcctools currently do not compile for x64 - move to variant for the time being
-variant odcctools \
-	description "Use the odcctools instead of the system provided ones - does not work for x64 currently!" {
-	depends_lib-append	port:odcctools
-	post-patch {
-		reinplace "s|/usr/bin/libtool|${prefix}/bin/odlibtool|g" \
-			${workpath}/gcc-${version}/gcc/config/darwin.h
-	}
-	configure.args-append	--with-as=${prefix}/bin/odas \
-				--with-ld=${prefix}/bin/odld \
-				--with-ar=${prefix}/bin/odar
+platform i386 {
+    configure.universal_archs i386 x86_64
 }
+variant universal {
+    configure.args-delete --disable-multilib
+}
 
-#variant x86_64										\
-	#description "Create an Intel 64 bit compiler." {
-	#configure.args-append				\
-		#--build=i386-apple-darwin9		\
-		#--host=i386-apple-darwin9		\
-		#--target=x86_64-apple-darwin9
-		##APXSLDFLAGS='-arch x86_64'		\
-		##--with-apxs=/usr/sbin/apxs
-		##CFLAGS='-arch x86_64'			\
+#variant x86_64                                                                         \
+        #description "Create an Intel 64 bit compiler." {
+        #configure.args-append                          \
+                #--build=i386-apple-darwin9             \
+                #--host=i386-apple-darwin9              \
+                #--target=x86_64-apple-darwin9
+                ##APXSLDFLAGS='-arch x86_64'            \
+                ##--with-apxs=/usr/sbin/apxs
+                ##CFLAGS='-arch x86_64'                 \
 #}
 
+# the generated compiler doesn't accept -arch
+configure.env-append CPP="${configure.cc} -E"
+build.env-append CPP="${configure.cc} -E"
+configure.cc-append [get_canonical_archflags]
+configure.cc_archflags
+configure.cxx_archflags
+configure.objc_archflags
+configure.ld_archflags
+configure.universal_cflags
+configure.universal_cxxflags
+configure.universal_ldflags
+configure.universal_args
+
 #
 # Ada is the only language apart from C which is self hosted - meaning: you need
 # an ada compiler to compile ada. hence it is just a variant.
 #
-variant macada									\
-    description "Uses MacAda compiler (http://www.macada.org) to bootstrap!"	{
+variant macada                                                                  \
+    description "Uses MacAda compiler (http://www.macada.org) to bootstrap!"    {
     set bootprefix /usr/local/ada-4.3
     if {![file executable ${bootprefix}/bin/gnat]} {
         ui_msg "####################################################################"
@@ -312,18 +348,18 @@
         ui_msg "#  http://www.macada.org                                           #"
         ui_msg "####################################################################"
     }
-    configure.cc		${bootprefix}/bin/gcc
-    configure.cpp		${bootprefix}/bin/cpp
-    configure.cxx		${bootprefix}/bin/g++
-    configure.objc		${bootprefix}/bin/gcc
-    configure.env-append	PATH=${bootprefix}/bin:$env(PATH)
-    configure.env-append	GNATMAKE=${bootprefix}/bin/gnatmake
-    configure.env-append	GNATBIND=${bootprefix}/bin/gnatbind
+    configure.cc                ${bootprefix}/bin/gcc
+    configure.cpp               ${bootprefix}/bin/cpp
+    configure.cxx               ${bootprefix}/bin/g++
+    configure.objc              ${bootprefix}/bin/gcc
+    configure.env-append        PATH=${bootprefix}/bin:$env(PATH)
+    configure.env-append        GNATMAKE=${bootprefix}/bin/gnatmake
+    configure.env-append        GNATBIND=${bootprefix}/bin/gnatbind
 }
 
-variant gnatgpl										\
-    description "Uses GNAT/GPL compiler (http://libre.adacore.com) to bootstrap!"	{
-    set bootprefix /opt/gnat-2009-x86_64-apple-darwin9.6.0-bin
+variant gnatgpl                                                                         \
+    description "Uses GNAT/GPL compiler (http://libre.adacore.com) to bootstrap!"       {
+    set bootprefix /opt/gnat-2012-x86_64-apple-darwin10.8.0-bin
     if {![file executable ${bootprefix}/bin/gnat]} {
         ui_msg "####################################################################"
         ui_msg "#  Ada is self hosted (http://en.wikipedia.org/wiki/Self-hosting)  #"
@@ -332,17 +368,17 @@
         ui_msg "#  http://libre.adacore.com                                        #"
         ui_msg "####################################################################"
     }
-    configure.cc		${bootprefix}/bin/gcc
-    configure.cpp		${bootprefix}/bin/cpp
-    configure.cxx		${bootprefix}/bin/g++
-    configure.objc		${bootprefix}/bin/gcc
-    configure.env-append	PATH=${bootprefix}/bin:$env(PATH)
-    configure.env-append	GNATMAKE=${bootprefix}/bin/gnatmake
-    configure.env-append	GNATBIND=${bootprefix}/bin/gnatbind
+    configure.cc                ${bootprefix}/bin/gcc
+    configure.cpp               ${bootprefix}/bin/cpp
+    configure.cxx               ${bootprefix}/bin/g++
+    configure.objc              ${bootprefix}/bin/gcc
+    configure.env-append        PATH=${bootprefix}/bin:$env(PATH)
+    configure.env-append        GNATMAKE=${bootprefix}/bin/gnatmake
+    configure.env-append        GNATBIND=${bootprefix}/bin/gnatbind
 }
 
-variant gnuada											\
-    description "Uses the GnuAda (http://gnuada.sourceforge.net/) compiler to bootstrap!"	{
+variant gnuada                                                                                  \
+    description "Uses the GnuAda (http://gnuada.sourceforge.net/) compiler to bootstrap!"       {
     set bootprefix /opt/local
     if {![file executable ${bootprefix}/bin/gnat]} {
         ui_msg "####################################################################"
@@ -352,17 +388,17 @@
         ui_msg "#  http://gnuada.sourceforge.net                                   #"
         ui_msg "####################################################################"
     }
-    configure.cc		${bootprefix}/bin/gcc-gnat-4.4
-    configure.cpp		${bootprefix}/bin/cpp-gnat-4.4
-    configure.cxx		${bootprefix}/bin/g++-gnat-4.4
-    configure.objc		${bootprefix}/bin/gcc-gnat-4.4
-    configure.env-append	PATH=${bootprefix}/bin:$env(PATH)
-    configure.env-append	GNATMAKE=${bootprefix}/bin/gnatmake
-    configure.env-append	GNATBIND=${bootprefix}/bin/gnatbind
+    configure.cc                ${bootprefix}/bin/gcc-gnat-4.4
+    configure.cpp               ${bootprefix}/bin/cpp-gnat-4.4
+    configure.cxx               ${bootprefix}/bin/g++-gnat-4.4
+    configure.objc              ${bootprefix}/bin/gcc-gnat-4.4
+    configure.env-append        PATH=${bootprefix}/bin:$env(PATH)
+    configure.env-append        GNATMAKE=${bootprefix}/bin/gnatmake
+    configure.env-append        GNATBIND=${bootprefix}/bin/gnatbind
 }
 
-variant ada											\
-    description "Uses the MacPorts Ada (http://www.macports.org/) compiler to bootstrap!"	{
+variant ada                                                                                     \
+    description "Uses the MacPorts Ada (http://www.macports.org/) compiler to bootstrap!"       {
     if {![file executable ${prefix}/bin/gnat]} {
         ui_msg "####################################################################"
         ui_msg "#  Ada is self hosted (http://en.wikipedia.org/wiki/Self-hosting)  #"
@@ -377,13 +413,13 @@
         ui_msg "#  sudo port select --set gcc gnat-gcc                               #"
         ui_msg "######################################################################"
     }
-    configure.cc		${prefix}/bin/gcc
-    configure.cpp		${prefix}/bin/cpp
-    configure.cxx		${prefix}/bin/g++
-    configure.objc		${prefix}/bin/gcc
-    configure.env-append	PATH=${prefix}/bin:$env(PATH)
-    configure.env-append	GNATMAKE=${prefix}/bin/gnatmake
-    configure.env-append	GNATBIND=${prefix}/bin/gnatbind
+    configure.cc                ${prefix}/bin/gcc
+    configure.cpp               ${prefix}/bin/cpp
+    configure.cxx               ${prefix}/bin/g++
+    configure.objc              ${prefix}/bin/gcc
+    configure.env-append        PATH=${prefix}/bin:$env(PATH)
+    configure.env-append        GNATMAKE=${prefix}/bin/gnatmake
+    configure.env-append        GNATBIND=${prefix}/bin/gnatbind
 }
 
 pre-configure {
@@ -407,7 +443,7 @@
     ui_msg "######################################################"
 }
 
-livecheck.type	regex
-livecheck.url	http://gcc.gnu.org/gcc-4.4/
-livecheck.regex	GCC (4\\.4\\.\[0-9\])
+livecheck.type      regex
+livecheck.url       http://gcc.gnu.org/gcc-4.7/
+livecheck.regex     GCC (4\\.7\\.\[0-9\])
 

Copied: users/krischik/gnat-gcc-4.7/files/ppc_fde_encoding.diff (from rev 95361, trunk/dports/lang/gcc47/files/ppc_fde_encoding.diff)
===================================================================
--- users/krischik/gnat-gcc-4.7/files/ppc_fde_encoding.diff	                        (rev 0)
+++ users/krischik/gnat-gcc-4.7/files/ppc_fde_encoding.diff	2012-07-13 10:34:31 UTC (rev 95459)
@@ -0,0 +1,45 @@
+diff --git src/powerpc/darwin.S src/powerpc/darwin.S
+--- libffi/src/powerpc/darwin.S
++++ libffi/src/powerpc/darwin.S
+@@ -330,17 +330,17 @@ EH_frame1:
+ LSCIE1:
+ 	.long	0x0	; CIE Identifier Tag
+ 	.byte	0x1	; CIE Version
+ 	.ascii	"zR\0"	; CIE Augmentation
+ 	.byte	0x1	; uleb128 0x1; CIE Code Alignment Factor
+ 	.byte	EH_DATA_ALIGN_FACT ; sleb128 -4; CIE Data Alignment Factor
+ 	.byte	0x41	; CIE RA Column
+ 	.byte	0x1	; uleb128 0x1; Augmentation size
+-	.byte	0x90	; FDE Encoding (indirect pcrel)
++	.byte	0x10	; FDE Encoding (pcrel)
+ 	.byte	0xc	; DW_CFA_def_cfa
+ 	.byte	0x1	; uleb128 0x1
+ 	.byte	0x0	; uleb128 0x0
+ 	.align	LOG2_GPR_BYTES
+ LECIE1:
+ 
+ 	.globl _ffi_call_DARWIN.eh
+ _ffi_call_DARWIN.eh:
+diff --git src/powerpc/darwin_closure.S src/powerpc/darwin_closure.S
+--- libffi/src/powerpc/darwin_closure.S
++++ libffi/src/powerpc/darwin_closure.S
+@@ -479,17 +479,17 @@ EH_frame1:
+ LSCIE1:
+ 	.long	0x0	; CIE Identifier Tag
+ 	.byte	0x1	; CIE Version
+ 	.ascii	"zR\0"	; CIE Augmentation
+ 	.byte	0x1	; uleb128 0x1; CIE Code Alignment Factor
+ 	.byte	EH_DATA_ALIGN_FACT ; sleb128 -4; CIE Data Alignment Factor
+ 	.byte	0x41	; CIE RA Column
+ 	.byte	0x1	; uleb128 0x1; Augmentation size
+-	.byte	0x90	; FDE Encoding (indirect pcrel)
++	.byte	0x10	; FDE Encoding (pcrel)
+ 	.byte	0xc	; DW_CFA_def_cfa
+ 	.byte	0x1	; uleb128 0x1
+ 	.byte	0x0	; uleb128 0x0
+ 	.align	LOG2_GPR_BYTES
+ LECIE1:
+ 	.globl _ffi_closure_ASM.eh
+ _ffi_closure_ASM.eh:
+ LSFDE1:
+

Added: users/krischik/gnat-gcc-4.7/test.command
===================================================================
--- users/krischik/gnat-gcc-4.7/test.command	                        (rev 0)
+++ users/krischik/gnat-gcc-4.7/test.command	2012-07-13 10:34:31 UTC (rev 95459)
@@ -0,0 +1,88 @@
+#!/opt/local/bin/zsh
+
+setopt Err_Exit
+setopt X_Trace;
+
+if test "${USER}" = "root"; then
+    typeset prefix='/opt/local'
+    typeset bootprefix='/opt/gnat-2012-x86_64-apple-darwin10.8.0-bin'
+    typeset name=gnat
+    typeset major=4.7
+
+    #typeset -x -g AR_FOR_TARGET="/usr/bin/ar"
+    #typeset -x -g AS_FOR_TARGET="/usr/bin/as"
+    #typeset -x -g LD_FOR_TARGET="/usr/bin/ld"
+    #typeset -x -g NM_FOR_TARGET="/usr/bin/nm"
+    #typeset -x -g OBJDUMP_FOR_TARGET="/usr/bin/objdump"
+    #typeset -x -g RANLIB_FOR_TARGET="/usr/bin/ranlib"
+    #typeset -x -g STRIP_FOR_TARGET="/usr/bin/strip"
+
+    typeset -x -g AR_FOR_TARGET="${prefix}/bin/ar"
+    typeset -x -g AS_FOR_TARGET="${prefix}/bin/as"
+    typeset -x -g LD_FOR_TARGET="${prefix}/bin/ld"
+    typeset -x -g NM_FOR_TARGET="${prefix}/bin/nm"
+    typeset -x -g OBJDUMP_FOR_TARGET="${prefix}/bin/objdump"
+    typeset -x -g RANLIB_FOR_TARGET="${prefix}/bin/ranlib"
+    typeset -x -g STRIP_FOR_TARGET="${prefix}/bin/strip"
+
+    typeset -x -g CC="${bootprefix}/bin/gcc";
+    typeset -x -g CPP="${bootprefix}/bin/cpp";
+    typeset -x -g CXX="${bootprefix}/bin/g++";
+    typeset -x -g CXXCPP="${bootprefix}/bin/cpp";
+    typeset -x -g GNATBIND="${bootprefix}/bin/gnatbind";
+    typeset -x -g GNATMAKE="${bootprefix}/bin/gnatmake";
+    typeset -x -g OBJC="${bootprefix}/bin/gcc";
+
+    #typeset -x -g CPPFLAGS="-I${bootprefix}/include -I${prefix}/include";
+    #typeset -x -g LDFLAGS="-L${bootprefix}/lib -L${prefix}/lib";
+
+    #typeset -x -g CFLAGS="-O2";
+    #typeset -x -g CXXFLAGS="-O2";
+    #typeset -x -g F90FLAGS="-O2 -m64";
+    #typeset -x -g FCFLAGS="-O2 -m64";
+    #typeset -x -g FFLAGS="-O2 -m64";
+    #typeset -x -g INSTALL="/usr/bin/install -c";
+    #typeset -x -g MACOSX_DEPLOYMENT_TARGET="10.7";
+    #typeset -x -g OBJCFLAGS="-O2";
+
+    typeset -x -g PATH="${bootprefix}/bin:${prefix}/bin:${prefix}/sbin:/bin:/sbin:/usr/bin:/usr/sbin"
+
+    pushd "work/build";
+	grm --verbose **/config.cache || true;
+	gnice ../gcc-${major}.1/configure \
+	    --enable-languages=c,c++,ada,objc,obj-c++,java,fortran \
+            --libdir=${prefix}/lib/${name} \
+            --includedir=${prefix}/include/${name} \
+            --infodir=${prefix}/share/info \
+            --mandir=${prefix}/share/man \
+            --datarootdir=${prefix}/share/gcc-${major} \
+            --with-libiconv-prefix=${prefix} \
+            --with-local-prefix=${prefix} \
+            --with-system-zlib \
+            --disable-nls \
+            --program-suffix=-gnat-${major} \
+            --with-gxx-include-dir=${prefix}/include/${name}/c++/ \
+            --with-gmp=${prefix} \
+            --with-mpfr=${prefix} \
+            --with-mpc=${prefix} \
+            --with-ppl=${prefix} \
+            --with-cloog=${prefix} \
+	    --enable-cloog-backend=isl \
+            --enable-stage1-checking \
+            --disable-multilib \
+            --enable-lto \
+            --with-as=${prefix}/bin/as \
+            --with-ld=${prefix}/bin/ld \
+            --with-ar=${prefix}/bin/ar \
+            --with-bugurl=https://trac.macports.org/newticket
+	gnice make
+    popd;
+else
+    setopt Multi_OS;
+
+    sudo ${0:a} 1>&1 2>&2 &>~/Library/Logs/${0:r:t}.out;
+fi;
+
+
+# vim: set nowrap tabstop=8 shiftwidth=4 softtabstop=4 noexpandtab :
+# vim: set textwidth=0 filetype=zsh foldmethod=marker nospell :


Property changes on: users/krischik/gnat-gcc-4.7/test.command
___________________________________________________________________
Added: svn:executable
   + *

Added: users/krischik/gnat-gcc-4.7/test2.command
===================================================================
--- users/krischik/gnat-gcc-4.7/test2.command	                        (rev 0)
+++ users/krischik/gnat-gcc-4.7/test2.command	2012-07-13 10:34:31 UTC (rev 95459)
@@ -0,0 +1,84 @@
+#!/opt/local/bin/zsh
+
+setopt Err_Exit
+setopt X_Trace
+
+if test "${USER}" = "root"; then
+    typeset prefix='/opt/local'
+    typeset bootprefix='/opt/gcc-4.5.0-x86_64'
+
+    #typeset -x -g AR_FOR_TARGET="/usr/bin/ar"
+    #typeset -x -g AS_FOR_TARGET="/usr/bin/as"
+    #typeset -x -g LD_FOR_TARGET="/usr/bin/ld"
+    #typeset -x -g NM_FOR_TARGET="/usr/bin/nm"
+    #typeset -x -g OBJDUMP_FOR_TARGET="/usr/bin/objdump"
+    #typeset -x -g RANLIB_FOR_TARGET="/usr/bin/ranlib"
+    #typeset -x -g STRIP_FOR_TARGET="/usr/bin/strip"
+
+    typeset -x -g AR_FOR_TARGET="/opt/local/bin/ar"
+    typeset -x -g AS_FOR_TARGET="/opt/local/bin/as"
+    typeset -x -g LD_FOR_TARGET="/opt/local/bin/ld"
+    typeset -x -g NM_FOR_TARGET="/opt/local/bin/nm"
+    typeset -x -g OBJDUMP_FOR_TARGET="/opt/local/bin/objdump"
+    typeset -x -g RANLIB_FOR_TARGET="/opt/local/bin/ranlib"
+    typeset -x -g STRIP_FOR_TARGET="/opt/local/bin/strip"
+
+    typeset -x -g CC="${bootprefix}/bin/gcc"
+    typeset -x -g CPP="${bootprefix}/bin/cpp"
+    typeset -x -g GNATBIND="${bootprefix}/bin/gnatbind"
+    typeset -x -g GNATMAKE="${bootprefix}/bin/gnatmake"
+    typeset -x -g OBJC="${bootprefix}/bin/gcc"
+
+    typeset -x -g CPPFLAGS="-I${bootprefix}/include -I${prefix}/include"
+    typeset -x -g CXX="${bootprefix}/bin/g++"
+    typeset -x -g CXXCPP="${bootprefix}/bin/cpp"
+
+    #typeset -x -g CFLAGS="-O2"
+    #typeset -x -g CXXFLAGS="-O2"
+    #typeset -x -g F90FLAGS="-O2"
+    #typeset -x -g FCFLAGS="-O2"
+    #typeset -x -g FFLAGS="-O2"
+    #typeset -x -g OBJCFLAGS="-O2"
+
+    typeset -x -g INSTALL="/usr/bin/install -c"
+    typeset -x -g LDFLAGS="-L${prefix}/lib"
+    typeset -x -g MACOSX_DEPLOYMENT_TARGET="10.6"
+    typeset -x -g PATH="${bootprefix}/bin:${prefix}/bin:${prefix}/sbin:/bin:/sbin:/usr/bin:/usr/sbin"
+
+    pushd "work/build"
+	if test -e makefile; then
+	    gnice make distclean
+	fi;
+
+	gnice ../gcc-4.5.2/configure					    \
+	    --prefix=${prefix}						    \
+	    --build=x86_64-apple-darwin10				    \
+	    --enable-languages=c,ada,c++,fortran			    \
+	    --libdir=${prefix}/lib/gnat-gcc				    \
+	    --includedir=${prefix}/include/gnat-gcc			    \
+	    --infodir=${prefix}/share/info				    \
+	    --mandir=${prefix}/share/man				    \
+	    --datarootdir=${prefix}/share/gcc-4.5			    \
+	    --with-local-prefix=${prefix}				    \
+	    --with-system-zlib						    \
+	    --program-suffix=-gnat-4.5					    \
+	    --with-gxx-include-dir=${prefix}/include/gnat-gcc/c++/	    \
+	    --with-gmp=${prefix}					    \
+	    --with-mpfr=${prefix}					    \
+	    --with-mpc==${prefix}					    
+
+#../gcc-trunk-svn/configure --prefix=/opt/gcc-4.6.0-x86_64 \
+#--disable-multilib --enable-languages=c,ada,c++,fortran \
+#--with-gmp=/opt/gnu --with-mpfr=/opt/gnu --with-mpc=/opt/gnu \
+#--build=x86_64-apple-darwin10 --disable-bootstrap
+
+	gnice make
+    popd
+else
+    setopt Multi_OS
+
+    sudo ${0:a} 1>&1 2>&2 &>~/Library/Logs/${0:r:t}.out
+fi
+
+# vim: set nowrap tabstop=8 shiftwidth=4 softtabstop=4 noexpandtab :
+# vim: set textwidth=0 filetype=zsh foldmethod=marker nospell :


Property changes on: users/krischik/gnat-gcc-4.7/test2.command
___________________________________________________________________
Added: svn:executable
   + *
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120713/b2247a7c/attachment-0001.html>


More information about the macports-changes mailing list