[91374] trunk/dports/lang/apple-gcc42

[jeremyhu at macports.org]

Revision: 91374
          https://trac.macports.org/changeset/91374
Author:   jeremyhu at macports.org
Date:     2012-03-30 17:21:25 -0700 (Fri, 30 Mar 2012)
Log Message:
-----------
apple-gcc42: Fix a corner case when using the driver-driver to link

Modified Paths:
--------------
    trunk/dports/lang/apple-gcc42/Portfile

Added Paths:
-----------
    trunk/dports/lang/apple-gcc42/files/driverdriver-num_infiles.patch

Modified: trunk/dports/lang/apple-gcc42/Portfile
===================================================================
--- trunk/dports/lang/apple-gcc42/Portfile	2012-03-31 00:08:55 UTC (rev 91373)
+++ trunk/dports/lang/apple-gcc42/Portfile	2012-03-31 00:21:25 UTC (rev 91374)
@@ -6,7 +6,7 @@
 name			apple-gcc42
 version			5666.3
 set gcc_version		4.2.1
-revision		2
+revision		3
 categories		lang
 platforms		darwin
 license         GPL-2
@@ -58,16 +58,18 @@
 set objroot ${workpath}/objroot
 set symroot ${workpath}/symroot
 
-# system-libstdc++.patch   : Adjust build system to use libstdc++ from / since we don't have it in MacPorts
-# no-rm-system.patch       : Comment out a rogue rm /usr/... in the build script
-# prefix.patch             : Fix hardcoded instances of /usr
-# suffix.patch             : Make binaries end in -apple-4.2
-# stage1-cc.patch          : Use $CC for our stage1 compiler
-# other_langs.patch        : Add support for gcj and gfortran to build_gcc
-# makeinfo.patch           : Fix version detection for makeinfo in configure scripts
-# werror-*.patch           : Fix compilation errors when building for x86_64
-# incpath.patch            : Don't prepend the -isysroot option argument to the compiler's own search paths
-# universal.patch          : Set $CBUILD to $CHOST if $CBUILD is x86_64 and $CHOST is i686 (ie, don't "cross-compile")
+# system-libstdc++.patch         : Adjust build system to use libstdc++ from / since we don't have it in MacPorts
+# no-rm-system.patch             : Comment out a rogue rm /usr/... in the build script
+# prefix.patch                   : Fix hardcoded instances of /usr
+# suffix.patch                   : Make binaries end in -apple-4.2
+# stage1-cc.patch                : Use $CC for our stage1 compiler
+# other_langs.patch              : Add support for gcj and gfortran to build_gcc
+# makeinfo.patch                 : Fix version detection for makeinfo in configure scripts
+# werror-*.patch                 : Fix compilation errors when building for x86_64
+# incpath.patch                  : Don't prepend the -isysroot option argument to the compiler's own search paths
+# universal.patch                : Set $CBUILD to $CHOST if $CBUILD is x86_64 and $CHOST is i686 (ie, don't "cross-compile")
+# driverdriver-num_infiles.patch : Fix linking with no input files (ie all static archives passed with -l...)
+
 patchfiles \
 	system-libstdc++.patch \
 	no-rm-system.patch \
@@ -79,7 +81,8 @@
 	werror-c-incpath.patch \
 	werror-local-alloc.patch \
 	incpath.patch \
-	universal.patch
+	universal.patch \
+	driverdriver-num_infiles.patch 
 
 # gcj fails to build:
 # gcc/java/lang.c: In function 'java_init':

Added: trunk/dports/lang/apple-gcc42/files/driverdriver-num_infiles.patch
===================================================================
--- trunk/dports/lang/apple-gcc42/files/driverdriver-num_infiles.patch	                        (rev 0)
+++ trunk/dports/lang/apple-gcc42/files/driverdriver-num_infiles.patch	2012-03-31 00:21:25 UTC (rev 91374)
@@ -0,0 +1,11 @@
+--- driverdriver.c.orig	2012-03-30 15:23:03.000000000 -0700
++++ driverdriver.c	2012-03-30 15:43:40.000000000 -0700
+@@ -1599,7 +1599,7 @@ main (int argc, const char **argv)
+ 
+       /* If more than one input files are supplied but only one output filename
+ 	 is present then IMA will be used.  */
+-      if (num_infiles > 1 && !compile_only_request)
++      if (num_infiles != 1 && !compile_only_request)
+ 	ima_is_used = 1;
+ 
+       /* Linker wants to know this in case of multiple -arch.  */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120330/5c7d5b1e/attachment.html>