[104047] users/larryv/dports/lang/rust
larryv at macports.org
larryv at macports.org
Wed Mar 13 19:00:18 PDT 2013
Revision: 104047
https://trac.macports.org/changeset/104047
Author: larryv at macports.org
Date: 2013-03-13 19:00:18 -0700 (Wed, 13 Mar 2013)
Log Message:
-----------
[sandbox] rust: Remove -arch flags when compiling with gcc or dragonegg.
Modified Paths:
--------------
users/larryv/dports/lang/rust/Portfile
users/larryv/dports/lang/rust/files/patch-non_apple_gcc.diff
Modified: users/larryv/dports/lang/rust/Portfile
===================================================================
--- users/larryv/dports/lang/rust/Portfile 2013-03-14 01:45:40 UTC (rev 104046)
+++ users/larryv/dports/lang/rust/Portfile 2013-03-14 02:00:18 UTC (rev 104047)
@@ -82,8 +82,9 @@
patch-src-etc-local_stage0.sh.diff \
patch-src-librusti-rusti.rc.diff \
patch-src-rustllvm-RustWrapper.cpp.diff
-# Non-Apple GCC (and, by extension, DragonEgg) doesn't accept
-# -Wnewline-eof. https://github.com/mozilla/rust/issues/4783
+# Non-Apple GCC - and, by extension, DragonEgg - accepts neither
+# -Wnewline-eof (https://github.com/mozilla/rust/issues/4783)
+# nor -arch (until 4.7).
if {[string first clang ${configure.compiler}] == -1} {
patchfiles-append patch-non_apple_gcc.diff
}
Modified: users/larryv/dports/lang/rust/files/patch-non_apple_gcc.diff
===================================================================
--- users/larryv/dports/lang/rust/files/patch-non_apple_gcc.diff 2013-03-14 01:45:40 UTC (rev 104046)
+++ users/larryv/dports/lang/rust/files/patch-non_apple_gcc.diff 2013-03-14 02:00:18 UTC (rev 104047)
@@ -1,120 +1,159 @@
diff --git mk/libuv/ia32/mac/src/libuv/run-benchmarks.target.mk mk/libuv/ia32/mac/src/libuv/run-benchmarks.target.mk
-index b8cc0a1..1178a52 100644
+index b8cc0a1..b72d2da 100644
--- mk/libuv/ia32/mac/src/libuv/run-benchmarks.target.mk
+++ mk/libuv/ia32/mac/src/libuv/run-benchmarks.target.mk
-@@ -14,7 +14,6 @@ DEFS_Debug := '-D_LARGEFILE_SOURCE' \
+@@ -14,8 +14,7 @@ DEFS_Debug := '-D_LARGEFILE_SOURCE' \
CFLAGS_Debug := -Os \
-gdwarf-2 \
-fvisibility=hidden \
- -Wnewline-eof \
- -arch i386 \
+- -arch i386 \
++ -m32 \
-fno-strict-aliasing \
-Wall \
-@@ -49,7 +48,6 @@ DEFS_Release := '-D_LARGEFILE_SOURCE' \
+ -Wendif-labels \
+@@ -49,8 +48,7 @@ DEFS_Release := '-D_LARGEFILE_SOURCE' \
CFLAGS_Release := -Os \
-gdwarf-2 \
-fvisibility=hidden \
- -Wnewline-eof \
- -arch i386 \
+- -arch i386 \
++ -m32 \
-fno-strict-aliasing \
-Wall \
+ -Wendif-labels \
diff --git mk/libuv/ia32/mac/src/libuv/run-tests.target.mk mk/libuv/ia32/mac/src/libuv/run-tests.target.mk
-index be0c2c6..546cef4 100644
+index be0c2c6..c48674e 100644
--- mk/libuv/ia32/mac/src/libuv/run-tests.target.mk
+++ mk/libuv/ia32/mac/src/libuv/run-tests.target.mk
-@@ -14,7 +14,6 @@ DEFS_Debug := '-D_LARGEFILE_SOURCE' \
+@@ -14,8 +14,7 @@ DEFS_Debug := '-D_LARGEFILE_SOURCE' \
CFLAGS_Debug := -Os \
-gdwarf-2 \
-fvisibility=hidden \
- -Wnewline-eof \
- -arch i386 \
+- -arch i386 \
++ -m32 \
-fno-strict-aliasing \
-Wall \
-@@ -49,7 +48,6 @@ DEFS_Release := '-D_LARGEFILE_SOURCE' \
+ -Wendif-labels \
+@@ -49,8 +48,7 @@ DEFS_Release := '-D_LARGEFILE_SOURCE' \
CFLAGS_Release := -Os \
-gdwarf-2 \
-fvisibility=hidden \
- -Wnewline-eof \
- -arch i386 \
+- -arch i386 \
++ -m32 \
-fno-strict-aliasing \
-Wall \
+ -Wendif-labels \
diff --git mk/libuv/ia32/mac/src/libuv/uv.target.mk mk/libuv/ia32/mac/src/libuv/uv.target.mk
-index 9838606..b978d23 100644
+index 9838606..427fca2 100644
--- mk/libuv/ia32/mac/src/libuv/uv.target.mk
+++ mk/libuv/ia32/mac/src/libuv/uv.target.mk
-@@ -17,7 +17,6 @@ DEFS_Debug := '-D_LARGEFILE_SOURCE' \
+@@ -17,8 +17,7 @@ DEFS_Debug := '-D_LARGEFILE_SOURCE' \
CFLAGS_Debug := -Os \
-gdwarf-2 \
-fvisibility=hidden \
- -Wnewline-eof \
- -arch i386 \
+- -arch i386 \
++ -m32 \
-fno-strict-aliasing \
-Wall \
-@@ -59,7 +58,6 @@ DEFS_Release := '-D_LARGEFILE_SOURCE' \
+ -Wendif-labels \
+@@ -59,8 +58,7 @@ DEFS_Release := '-D_LARGEFILE_SOURCE' \
CFLAGS_Release := -Os \
-gdwarf-2 \
-fvisibility=hidden \
- -Wnewline-eof \
- -arch i386 \
+- -arch i386 \
++ -m32 \
-fno-strict-aliasing \
-Wall \
+ -Wendif-labels \
diff --git mk/libuv/x86_64/mac/src/libuv/run-benchmarks.target.mk mk/libuv/x86_64/mac/src/libuv/run-benchmarks.target.mk
-index f5930c9..5299d44 100644
+index f5930c9..8734156 100644
--- mk/libuv/x86_64/mac/src/libuv/run-benchmarks.target.mk
+++ mk/libuv/x86_64/mac/src/libuv/run-benchmarks.target.mk
-@@ -14,7 +14,6 @@ DEFS_Debug := '-D_LARGEFILE_SOURCE' \
+@@ -14,8 +14,7 @@ DEFS_Debug := '-D_LARGEFILE_SOURCE' \
CFLAGS_Debug := -Os \
-gdwarf-2 \
-fvisibility=hidden \
- -Wnewline-eof \
- -arch x86_64 \
+- -arch x86_64 \
++ -m64 \
-fno-strict-aliasing \
-Wall \
-@@ -49,7 +48,6 @@ DEFS_Release := '-D_LARGEFILE_SOURCE' \
+ -Wendif-labels \
+@@ -49,8 +48,7 @@ DEFS_Release := '-D_LARGEFILE_SOURCE' \
CFLAGS_Release := -Os \
-gdwarf-2 \
-fvisibility=hidden \
- -Wnewline-eof \
- -arch x86_64 \
+- -arch x86_64 \
++ -m64 \
-fno-strict-aliasing \
-Wall \
+ -Wendif-labels \
diff --git mk/libuv/x86_64/mac/src/libuv/run-tests.target.mk mk/libuv/x86_64/mac/src/libuv/run-tests.target.mk
-index 4694c7c..b7944b8 100644
+index 4694c7c..fc93deb 100644
--- mk/libuv/x86_64/mac/src/libuv/run-tests.target.mk
+++ mk/libuv/x86_64/mac/src/libuv/run-tests.target.mk
-@@ -14,7 +14,6 @@ DEFS_Debug := '-D_LARGEFILE_SOURCE' \
+@@ -14,8 +14,7 @@ DEFS_Debug := '-D_LARGEFILE_SOURCE' \
CFLAGS_Debug := -Os \
-gdwarf-2 \
-fvisibility=hidden \
- -Wnewline-eof \
- -arch x86_64 \
+- -arch x86_64 \
++ -m64 \
-fno-strict-aliasing \
-Wall \
-@@ -49,7 +48,6 @@ DEFS_Release := '-D_LARGEFILE_SOURCE' \
+ -Wendif-labels \
+@@ -49,8 +48,7 @@ DEFS_Release := '-D_LARGEFILE_SOURCE' \
CFLAGS_Release := -Os \
-gdwarf-2 \
-fvisibility=hidden \
- -Wnewline-eof \
- -arch x86_64 \
+- -arch x86_64 \
++ -m64 \
-fno-strict-aliasing \
-Wall \
+ -Wendif-labels \
diff --git mk/libuv/x86_64/mac/src/libuv/uv.target.mk mk/libuv/x86_64/mac/src/libuv/uv.target.mk
-index 385a64c..a2cf5fd 100644
+index 385a64c..6a348a1 100644
--- mk/libuv/x86_64/mac/src/libuv/uv.target.mk
+++ mk/libuv/x86_64/mac/src/libuv/uv.target.mk
-@@ -17,7 +17,6 @@ DEFS_Debug := '-D_LARGEFILE_SOURCE' \
+@@ -17,8 +17,7 @@ DEFS_Debug := '-D_LARGEFILE_SOURCE' \
CFLAGS_Debug := -Os \
-gdwarf-2 \
-fvisibility=hidden \
- -Wnewline-eof \
- -arch x86_64 \
+- -arch x86_64 \
++ -m64 \
-fno-strict-aliasing \
-Wall \
-@@ -59,7 +58,6 @@ DEFS_Release := '-D_LARGEFILE_SOURCE' \
+ -Wendif-labels \
+@@ -59,8 +58,7 @@ DEFS_Release := '-D_LARGEFILE_SOURCE' \
CFLAGS_Release := -Os \
-gdwarf-2 \
-fvisibility=hidden \
- -Wnewline-eof \
- -arch x86_64 \
+- -arch x86_64 \
++ -m64 \
-fno-strict-aliasing \
-Wall \
+ -Wendif-labels \
+diff --git mk/platform.mk mk/platform.mk
+index d2f8745..12fb7e2 100644
+--- mk/platform.mk
++++ mk/platform.mk
+@@ -101,8 +101,8 @@ ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
+ # approaches welcome!
+ #
+ # NB: Currently GCC's optimizer breaks rustrt (task-comm-1 hangs) on Darwin.
+- CFG_GCCISH_CFLAGS_i386 := -m32 -arch i386
+- CFG_GCCISH_CFLAGS_x86_64 := -m64 -arch x86_64
++ CFG_GCCISH_CFLAGS_i386 := -m32
++ CFG_GCCISH_CFLAGS_x86_64 := -m64
+ CFG_GCCISH_LINK_FLAGS_i386 := -m32
+ CFG_GCCISH_LINK_FLAGS_x86_64 := -m64
+ CFG_DSYMUTIL := dsymutil
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130313/7bf37aec/attachment.html>
More information about the macports-changes
mailing list