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

[jeremyhu at macports.org]

Revision: 93187
          https://trac.macports.org/changeset/93187
Author:   jeremyhu at macports.org
Date:     2012-05-17 03:26:22 -0700 (Thu, 17 May 2012)
Log Message:
-----------
apple-gcc42: Revert the changes made for #34233 and replace them with a hack that actually accomplishes the goal...

Modified Paths:
--------------
    trunk/dports/lang/apple-gcc42/Portfile
    trunk/dports/lang/apple-gcc42/files/incpath.patch

Modified: trunk/dports/lang/apple-gcc42/Portfile
===================================================================
--- trunk/dports/lang/apple-gcc42/Portfile	2012-05-17 10:07:13 UTC (rev 93186)
+++ trunk/dports/lang/apple-gcc42/Portfile	2012-05-17 10:26:22 UTC (rev 93187)
@@ -6,7 +6,7 @@
 name			apple-gcc42
 version			5666.3
 set gcc_version		4.2.1
-revision		6
+revision		7
 categories		lang
 platforms		darwin
 license         GPL-2

Modified: trunk/dports/lang/apple-gcc42/files/incpath.patch
===================================================================
--- trunk/dports/lang/apple-gcc42/files/incpath.patch	2012-05-17 10:07:13 UTC (rev 93186)
+++ trunk/dports/lang/apple-gcc42/files/incpath.patch	2012-05-17 10:26:22 UTC (rev 93187)
@@ -1,36 +1,11 @@
---- gcc/c-incpath.c.orig	2011-11-06 23:49:39.000000000 -0500
-+++ gcc/c-incpath.c	2011-11-06 23:49:39.000000000 -0500
-@@ -164,10 +164,30 @@
+--- gcc/c-incpath.c.orig	2012-04-27 11:33:12.000000000 -0700
++++ gcc/c-incpath.c	2012-04-27 11:34:17.000000000 -0700
+@@ -164,7 +164,7 @@ add_standard_paths (const char *sysroot,
  	  char *str;
  
  	  /* Should this directory start with the sysroot?  */
 -	  if (sysroot && p->add_sysroot)
--	    str = concat (sysroot, p->fname, NULL);
--	  else
-+	  if (sysroot && p->add_sysroot) {
-+        if (false) {
-+        }
-+        /* Don't append the MacPorts prefix to the sysroot, and instead use
-+           "/usr/include". This is because the "-isysroot" option almost always
-+           refers to an Mac OS X SDK which is structured that way. */
-+        #ifdef PREFIX_INCLUDE_DIR
-+        else if (!strcmp (p->fname, PREFIX_INCLUDE_DIR)) {
-+          str = concat (sysroot, "/usr/include", NULL);
-+        }
-+        #endif
-+        /* Don't append the MacPorts compiler's include directory to the
-+           sysroot, and instead use it as-is. This is because the "-isysroot"
-+           option almost always refers to an Mac OS X SDK which surely does not
-+           contain a hierarchy for the compiler in question. */
-+        else if (!strcmp (p->fname, cpp_GCC_INCLUDE_DIR)) {
-+           str = (char *) cpp_GCC_INCLUDE_DIR;
-+        }
-+        else {
-+          str = concat (sysroot, p->fname, NULL);
-+        }
-+      } else {
++	  if (sysroot && p->add_sysroot && strstr(p->fname, "apple-gcc42") == NULL)
+ 	    str = concat (sysroot, p->fname, NULL);
+ 	  else
  	    str = update_path (p->fname, p->component);
-+      }
- 
- 	  if (p->multilib && imultilib)
- 	    str = concat (str, dir_separator_str, imultilib, NULL);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120517/3d2eb04f/attachment.html>