[98627] trunk/dports/devel/cctools

[jeremyhu at macports.org]

Revision: 98627
          http://trac.macports.org//changeset/98627
Author:   jeremyhu at macports.org
Date:     2012-10-10 17:27:33 -0700 (Wed, 10 Oct 2012)
Log Message:
-----------
cctools: Allow "arch" to be a substring of an include directory with gcc4[345] (#36428).

Modified Paths:
--------------
    trunk/dports/devel/cctools/Portfile

Added Paths:
-----------
    trunk/dports/devel/cctools/files/PR-12475288.patch

Modified: trunk/dports/devel/cctools/Portfile
===================================================================
--- trunk/dports/devel/cctools/Portfile	2012-10-11 00:17:24 UTC (rev 98626)
+++ trunk/dports/devel/cctools/Portfile	2012-10-11 00:27:33 UTC (rev 98627)
@@ -4,7 +4,7 @@
 name                    cctools
 # XCode 4.4
 version                 829
-revision                1
+revision                2
 categories              devel
 platforms               darwin
 maintainers             mfeiri jeremyhu openmaintainer
@@ -23,14 +23,14 @@
 depends_lib             port:cctools-headers
 depends_build           port:ld64
 
-patchfiles              cctools-829-lto.patch
+patchfiles              cctools-829-lto.patch PR-12475288.patch
 
 variant universal {}
 
 if {${os.arch} == "powerpc" || ${os.major} < 9} {
     # XCode 4.1
     version             806
-    revision            1
+    revision            2
     distname            cctools-${version}
     checksums           rmd160  91c0a3f192f1eed60b64ef5a0a06918d0ce0b0c9 \
                         sha256  6116c06920112c634f6df2fa8b2f171ee3b90ff2176137da5856336695a6a676

Added: trunk/dports/devel/cctools/files/PR-12475288.patch
===================================================================
--- trunk/dports/devel/cctools/files/PR-12475288.patch	                        (rev 0)
+++ trunk/dports/devel/cctools/files/PR-12475288.patch	2012-10-11 00:27:33 UTC (rev 98627)
@@ -0,0 +1,18 @@
+--- as/driver.c.orig	2012-10-10 17:17:27.000000000 -0700
++++ as/driver.c	2012-10-10 17:21:11.000000000 -0700
+@@ -107,8 +107,15 @@ char **envp)
+ 		    case 'I':	/* -I directory */
+ 		    case 'm':	/* -mc68000, -mc68010 and mc68020 */
+ 		    case 'N':	/* -NEXTSTEP-deployment-target */
++			/* We want to skip the next argv if the value is not contained in this argv
++			 * eg: -I dir
++			 */
+ 			if(p[1] == '\0')
+ 			    i++;
++
++			/* And in case the value is contained in this argv (eg: -Idir), skip the rest */
++			while(p[1])
++			    p++;
+ 			break;
+ 
+ 		    case 'a':
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121010/4bb1e60e/attachment.html>