[60292] trunk/dports/lang/gnat-gcc

[krischik at macports.org]

Revision: 60292
          http://trac.macports.org/changeset/60292
Author:   krischik at macports.org
Date:     2009-11-08 08:47:18 -0800 (Sun, 08 Nov 2009)
Log Message:
-----------
diff and merge with gcc44

Modified Paths:
--------------
    trunk/dports/lang/gnat-gcc/Portfile

Added Paths:
-----------
    trunk/dports/lang/gnat-gcc/files/Make-lang.in.diff

Modified: trunk/dports/lang/gnat-gcc/Portfile
===================================================================
--- trunk/dports/lang/gnat-gcc/Portfile	2009-11-08 13:54:02 UTC (rev 60291)
+++ trunk/dports/lang/gnat-gcc/Portfile	2009-11-08 16:47:18 UTC (rev 60292)
@@ -4,11 +4,13 @@
 PortSystem	1.0
 
 name			gnat-gcc
+epoch			1
 version			4.4.1
 revision		0
 platforms		darwin
 categories		lang
 maintainers		krischik
+license			GPLv3
 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.
@@ -38,16 +40,27 @@
 use_bzip2		yes
 
 # gmp and mpfr are not universal
-universal_variant	no
+universal_variant       no
 
 depends_lib		port:gmp port:mpfr port:libiconv port:gcc_select
 
+patchfiles      Make-lang.in.diff
+patch.dir       ${workpath}/gcc-${version}
+
 set major		4.4
 
 worksrcdir		build
-dist_subdir		gcc43
+dist_subdir		gcc44
 
-pre-configure {
+# the generated compiler doesn't accept -arch
+if {[info exists build_arch] && ${os.platform} == "darwin"} {
+    configure.cc_archflags
+    configure.cxx_archflags
+    configure.objc_archflags
+    configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
+}
+
+post-extract {
 	file mkdir ${worksrcpath}
 }
 
@@ -72,12 +85,11 @@
 			OBJDUMP_FOR_TARGET=/usr/bin/objdump \
 			RANLIB_FOR_TARGET=/usr/bin/ranlib \
 			STRIP_FOR_TARGET=/usr/bin/strip
-#			LIPO_FOR_TARGET=/usr/bin/lipo
 
+build.target	bootstrap
 use_parallel_build	yes
 
 destroot.target install install-info-host
-# install-info # errors on objc-info files
 
 post-destroot {
 	file delete -force ${destroot}${prefix}/share/man/man7 \
@@ -259,7 +271,7 @@
 
 #platform darwin 7 {
 #	configure.cflags-append	-force_cpusubtype_ALL
-#	confgiure.env	BOOT_CFLAGS="-g -O2 -force_cpusubtype_ALL"
+#	confgiure.env 	BOOT_CFLAGS="-g -O2 -force_cpusubtype_ALL"
 #	build.args-append	XCFLAGS=-force_cpusubtype_ALL
 #}
 
@@ -271,7 +283,7 @@
 variant odcctools \
 	description "Use the odcctools instead of the system provided ones - does not work for x64 currently!" {
 	depends_lib-append	port:odcctools
-	patch {
+	post-patch {
 		reinplace "s|/usr/bin/libtool|${prefix}/bin/odlibtool|g" \
 			${workpath}/gcc-${version}/gcc/config/darwin.h
 	}
@@ -401,6 +413,7 @@
     ui_msg "######################################################"
 }
 
-livecheck.type  regex
+livecheck.type	regex
 livecheck.url	http://gcc.gnu.org/gcc-4.4/
-livecheck.regex GCC (4\\.4\\.\[0-9\])
+livecheck.regex	GCC (4\\.4\\.\[0-9\])
+

Copied: trunk/dports/lang/gnat-gcc/files/Make-lang.in.diff (from rev 59232, trunk/dports/lang/gcc44/files/Make-lang.in.diff)
===================================================================
--- trunk/dports/lang/gnat-gcc/files/Make-lang.in.diff	                        (rev 0)
+++ trunk/dports/lang/gnat-gcc/files/Make-lang.in.diff	2009-11-08 16:47:18 UTC (rev 60292)
@@ -0,0 +1,13 @@
+--- gcc/cp/Make-lang.in	2009/09/09 08:14:36	151554
++++ gcc/cp/Make-lang.in	2009/09/09 08:46:32	151555
+@@ -72,8 +72,8 @@
+ # Shared with C front end:
+ CXX_C_OBJS = attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o \
+ 	c-dump.o $(CXX_TARGET_OBJS) c-pretty-print.o c-opts.o c-pch.o \
+-	incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o \
+-	c-gimplify.o c-omp.o tree-inline.o
++	incpath.o c-ppoutput.o c-cppbuiltin.o prefix.o \
++	c-gimplify.o c-omp.o
+ 
+ # Language-specific object files for C++ and Objective C++.
+ CXX_AND_OBJCXX_OBJS = cp/call.o cp/decl.o cp/expr.o cp/pt.o cp/typeck2.o \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091108/467629d8/attachment.html>