Changeset 98487

Timestamp:

Oct 6, 2012, 9:45:20 PM (12 years ago)

Author:

jeremyhu@…

Message:

gcc4[78]: emutls fix for libstdcxx{,-devel} and linking fix for Mountain Lion

​http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53453
​http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54806

Location:

trunk/dports/lang

Files:

• gcc47/Portfile (modified) (2 diffs)
• gcc47/files/gcc-PR-53453.patch (added)
• gcc47/files/no-runtime-stubs.patch (deleted)
• gcc48/Portfile (modified) (2 diffs)
• gcc48/files/no-runtime-stubs.patch (deleted)

trunk/dports/lang/gcc47/Portfile

@@ -52 +52 @@
 depends_skip_archcheck-append gcc_select ld64 cctools
 
-patchfiles          ppc_fde_encoding.diff
-patch.dir           ${workpath}/gcc-${version}
-
+patchfiles          ppc_fde_encoding.diff  gcc-PR-53453.patch
 patch.dir           ${workpath}/gcc-${version}
 
@@ -129 +127 @@
     conflicts       libstdcxx-devel
 
-    # We might want to consider adding this patch to the gcc subport as well
-    # since it removes stuff that doesn't really make sense in the context of
-    # MacPorts
-    patchfiles-append  no-runtime-stubs.patch
+    post-patch {
+        # Force linking against a static libgcc
+        reinplace "/DENABLE_SHARED_LIBGCC/d" ${patch.dir}/gcc/Makefile.in
+    }
 
     depends_run-delete path:lib/libstdc\\\\+\\\\+.6.dylib:libstdcxx

trunk/dports/lang/gcc48/Portfile

@@ -8 +8 @@
 
 version             4.8-20120930
+# reset revision in libstdcxx-devel upon bump
 revision            1
 platforms           darwin
@@ -108 +109 @@
 if {${subport} == "libstdcxx-devel"} {
     conflicts       libstdcxx
+
+    # delete this revision as well when bumping base version
+    revision 2
     
-    # We might want to consider adding this patch to the gcc subport as well
-    # since it removes stuff that doesn't really make sense in the context of
-    # MacPorts
-    patchfiles-append  no-runtime-stubs.patch
+    post-patch {
+        # Force linking against a static libgcc
+        reinplace "/DENABLE_SHARED_LIBGCC/d" ${patch.dir}/gcc/Makefile.in
+    }
 
     depends_run-delete port:${subport}