[105649] trunk/dports/lang/rust

[larryv at macports.org]

Revision: 105649
          https://trac.macports.org/changeset/105649
Author:   larryv at macports.org
Date:     2013-04-29 13:36:25 -0700 (Mon, 29 Apr 2013)
Log Message:
-----------
rust: Remove -Werror; remove -arch with reinplace instead of patch.

Modified Paths:
--------------
    trunk/dports/lang/rust/Portfile

Removed Paths:
-------------
    trunk/dports/lang/rust/files/patch-mk-platform.mk.diff

Modified: trunk/dports/lang/rust/Portfile
===================================================================
--- trunk/dports/lang/rust/Portfile	2013-04-29 20:34:10 UTC (rev 105648)
+++ trunk/dports/lang/rust/Portfile	2013-04-29 20:36:25 UTC (rev 105649)
@@ -87,13 +87,21 @@
                     macports-gcc-4.7 macports-gcc-4.6 macports-gcc-4.5
 compiler.blacklist  {clang < 425}
 
-patch.pre_args          -p1
-patchfiles              patch-configure.diff
-# FSF GCC older than 4.7 does not accept -arch.
-if {[string match {macports-gcc-4.[4-6]} ${configure.compiler}] ||
-    [string match {macports-dragonegg-3.[0-2]} ${configure.compiler}]
-} then {
-    patchfiles-append   patch-mk-platform.mk.diff
+patch.pre_args      -p1
+patchfiles          patch-configure.diff
+post-patch {
+    # TODO: Use patches for these when the build system stops changing
+    # so much between releases.
+
+    # Pre-release software builds with a ton of warnings.
+    reinplace {s/ -Werror//} ${worksrcpath}/mk/platform.mk
+
+    # FSF GCC older than 4.7 does not accept -arch.
+    if {[string match {macports-gcc-4.[4-6]} ${configure.compiler}] ||
+        [string match {macports-dragonegg-3.[0-2]} ${configure.compiler}]
+    } then {
+        reinplace -E {s/ -arch (i386|x86_64)//} ${worksrcpath}/mk/platform.mk
+    }
 }
 
 # Building the bundled LLVM requires Python 2.4-2.7. All supported

Deleted: trunk/dports/lang/rust/files/patch-mk-platform.mk.diff
===================================================================
--- trunk/dports/lang/rust/files/patch-mk-platform.mk.diff	2013-04-29 20:34:10 UTC (rev 105648)
+++ trunk/dports/lang/rust/files/patch-mk-platform.mk.diff	2013-04-29 20:36:25 UTC (rev 105649)
@@ -1,22 +0,0 @@
-diff --git a/mk/platform.mk b/mk/platform.mk
-index 16b5ba4..2e1701a 100644
---- a/mk/platform.mk
-+++ b/mk/platform.mk
-@@ -171,7 +171,7 @@ AR_x86_64-apple-darwin=$(AR)
- CFG_LIB_NAME_x86_64-apple-darwin=lib$(1).dylib
- CFG_LIB_GLOB_x86_64-apple-darwin=lib$(1)-*.dylib
- CFG_LIB_DSYM_GLOB_x86_64-apple-darwin=lib$(1)-*.dylib.dSYM
--CFG_GCCISH_CFLAGS_x86_64-apple-darwin := -Wall -Werror -g -fPIC -m64 -arch x86_64
-+CFG_GCCISH_CFLAGS_x86_64-apple-darwin := -Wall -Werror -g -fPIC -m64
- CFG_GCCISH_CXXFLAGS_x86_64-apple-darwin := -fno-rtti
- CFG_GCCISH_LINK_FLAGS_x86_64-apple-darwin := -dynamiclib -lpthread -framework CoreServices -Wl,-no_compact_unwind -m64
- CFG_GCCISH_DEF_FLAG_x86_64-apple-darwin := -Wl,-exported_symbols_list,
-@@ -196,7 +196,7 @@ AR_i686-apple-darwin=$(AR)
- CFG_LIB_NAME_i686-apple-darwin=lib$(1).dylib
- CFG_LIB_GLOB_i686-apple-darwin=lib$(1)-*.dylib
- CFG_LIB_DSYM_GLOB_i686-apple-darwin=lib$(1)-*.dylib.dSYM
--CFG_GCCISH_CFLAGS_i686-apple-darwin := -Wall -Werror -g -fPIC -m32 -arch i386
-+CFG_GCCISH_CFLAGS_i686-apple-darwin := -Wall -Werror -g -fPIC -m32
- CFG_GCCISH_CXXFLAGS_i686-apple-darwin := -fno-rtti
- CFG_GCCISH_LINK_FLAGS_i686-apple-darwin := -dynamiclib -lpthread -framework CoreServices -Wl,-no_compact_unwind -m32
- CFG_GCCISH_DEF_FLAG_i686-apple-darwin := -Wl,-exported_symbols_list,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130429/8dc39a62/attachment-0001.html>