[104024] users/larryv/dports/lang/rust

larryv at macports.org larryv at macports.org
Tue Mar 12 22:14:45 PDT 2013 

Revision: 104024
          https://trac.macports.org/changeset/104024
Author:   larryv at macports.org
Date:     2013-03-12 22:14:45 -0700 (Tue, 12 Mar 2013)
Log Message:
-----------
[sandbox] rust: Add patch for gcc builds; move compiler blacklist above patchfiles so I can keep the patch stuff in one place.

Modified Paths:
--------------
    users/larryv/dports/lang/rust/Portfile

Added Paths:
-----------
    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-13 04:42:37 UTC (rev 104023)
+++ users/larryv/dports/lang/rust/Portfile	2013-03-13 05:14:45 UTC (rev 104024)
@@ -67,10 +67,26 @@
     system -W ${workpath} "${expand} | ${untar}"
 }
 
-patchfiles          patch-configure.diff \
-                    patch-src-etc-local_stage0.sh.diff \
-                    patch-src-librusti-rusti.rc.diff \
-                    patch-src-rustllvm-RustWrapper.cpp.diff
+# Upstream only supports gcc 4.4 and newer and clang based on LLVM
+# 3.0svn and newer. The clang restriction could probably be tighter;
+# clang-77 is Apple Clang 1.7 (LLVM 2.9svn) from Xcode 3.2.6.
+compiler.blacklist  gcc-3.3 gcc-4.0 gcc-4.2 \
+                    apple-gcc-4.0 apple-gcc-4.2 \
+                    llvm-gcc-4.2 macports-llvm-gcc-4.2 \
+                    macports-gcc-4.2 macports-gcc-4.3 \
+                    {clang <= 77} macports-clang-2.9
+# TODO: Remove when base fallback lists are updated (2.2?).
+compiler.fallback-append    macports-clang-3.2
+
+patchfiles              patch-configure.diff \
+                        patch-src-etc-local_stage0.sh.diff \
+                        patch-src-librusti-rusti.rc.diff \
+                        patch-src-rustllvm-RustWrapper.cpp.diff
+# Non-Apple GCC doesn't accept -Wnewline-eof.
+# https://github.com/mozilla/rust/issues/4783
+if {[string first clang ${configure.compiler}] == -1} {
+    patchfiles-append   patch-non_apple_gcc.diff
+}
 post-patch {
     reinplace "s/__BUILD_ARCH__/${configure.build_arch}/g" \
         ${worksrcpath}/configure
@@ -86,17 +102,7 @@
 depends_skip_archcheck  perl5 \
                         python27
 
-# Upstream only supports gcc 4.4 and newer and clang based on LLVM
-# 3.0svn and newer. The clang restriction could probably be tighter;
-# clang-77 is Apple Clang 1.7 (LLVM 2.9svn) from Xcode 3.2.6.
-compiler.blacklist  gcc-3.3 gcc-4.0 gcc-4.2 \
-                    apple-gcc-4.0 apple-gcc-4.2 \
-                    llvm-gcc-4.2 macports-llvm-gcc-4.2 \
-                    macports-gcc-4.2 macports-gcc-4.3 \
-                    {clang <= 77} macports-clang-2.9
-# TODO: Remove when automatic compiler dependencies and new fallback
-# lists are released (2.2?).
-compiler.fallback-append                macports-clang-3.2
+# TODO: Remove when automatic compiler dependencies are released (2.2?).
 if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
     set compiler $portconfigure::compiler_name_map(${configure.compiler})
     if {[string first macports-gcc- ${configure.compiler}] == 0} {

Added: users/larryv/dports/lang/rust/files/patch-non_apple_gcc.diff
===================================================================
--- users/larryv/dports/lang/rust/files/patch-non_apple_gcc.diff	                        (rev 0)
+++ users/larryv/dports/lang/rust/files/patch-non_apple_gcc.diff	2013-03-13 05:14:45 UTC (rev 104024)
@@ -0,0 +1,120 @@
+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
+--- 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' \
+ CFLAGS_Debug := -Os \
+ 	-gdwarf-2 \
+ 	-fvisibility=hidden \
+-	-Wnewline-eof \
+ 	-arch i386 \
+ 	-fno-strict-aliasing \
+ 	-Wall \
+@@ -49,7 +48,6 @@ DEFS_Release := '-D_LARGEFILE_SOURCE' \
+ CFLAGS_Release := -Os \
+ 	-gdwarf-2 \
+ 	-fvisibility=hidden \
+-	-Wnewline-eof \
+ 	-arch i386 \
+ 	-fno-strict-aliasing \
+ 	-Wall \
+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
+--- 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' \
+ CFLAGS_Debug := -Os \
+ 	-gdwarf-2 \
+ 	-fvisibility=hidden \
+-	-Wnewline-eof \
+ 	-arch i386 \
+ 	-fno-strict-aliasing \
+ 	-Wall \
+@@ -49,7 +48,6 @@ DEFS_Release := '-D_LARGEFILE_SOURCE' \
+ CFLAGS_Release := -Os \
+ 	-gdwarf-2 \
+ 	-fvisibility=hidden \
+-	-Wnewline-eof \
+ 	-arch i386 \
+ 	-fno-strict-aliasing \
+ 	-Wall \
+diff --git mk/libuv/ia32/mac/src/libuv/uv.target.mk mk/libuv/ia32/mac/src/libuv/uv.target.mk
+index 9838606..b978d23 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' \
+ CFLAGS_Debug := -Os \
+ 	-gdwarf-2 \
+ 	-fvisibility=hidden \
+-	-Wnewline-eof \
+ 	-arch i386 \
+ 	-fno-strict-aliasing \
+ 	-Wall \
+@@ -59,7 +58,6 @@ DEFS_Release := '-D_LARGEFILE_SOURCE' \
+ CFLAGS_Release := -Os \
+ 	-gdwarf-2 \
+ 	-fvisibility=hidden \
+-	-Wnewline-eof \
+ 	-arch i386 \
+ 	-fno-strict-aliasing \
+ 	-Wall \
+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
+--- 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' \
+ CFLAGS_Debug := -Os \
+ 	-gdwarf-2 \
+ 	-fvisibility=hidden \
+-	-Wnewline-eof \
+ 	-arch x86_64 \
+ 	-fno-strict-aliasing \
+ 	-Wall \
+@@ -49,7 +48,6 @@ DEFS_Release := '-D_LARGEFILE_SOURCE' \
+ CFLAGS_Release := -Os \
+ 	-gdwarf-2 \
+ 	-fvisibility=hidden \
+-	-Wnewline-eof \
+ 	-arch x86_64 \
+ 	-fno-strict-aliasing \
+ 	-Wall \
+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
+--- 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' \
+ CFLAGS_Debug := -Os \
+ 	-gdwarf-2 \
+ 	-fvisibility=hidden \
+-	-Wnewline-eof \
+ 	-arch x86_64 \
+ 	-fno-strict-aliasing \
+ 	-Wall \
+@@ -49,7 +48,6 @@ DEFS_Release := '-D_LARGEFILE_SOURCE' \
+ CFLAGS_Release := -Os \
+ 	-gdwarf-2 \
+ 	-fvisibility=hidden \
+-	-Wnewline-eof \
+ 	-arch x86_64 \
+ 	-fno-strict-aliasing \
+ 	-Wall \
+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
+--- 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' \
+ CFLAGS_Debug := -Os \
+ 	-gdwarf-2 \
+ 	-fvisibility=hidden \
+-	-Wnewline-eof \
+ 	-arch x86_64 \
+ 	-fno-strict-aliasing \
+ 	-Wall \
+@@ -59,7 +58,6 @@ DEFS_Release := '-D_LARGEFILE_SOURCE' \
+ CFLAGS_Release := -Os \
+ 	-gdwarf-2 \
+ 	-fvisibility=hidden \
+-	-Wnewline-eof \
+ 	-arch x86_64 \
+ 	-fno-strict-aliasing \
+ 	-Wall \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130312/0a750316/attachment-0001.html>

More information about the macports-changes mailing list