[104051] users/larryv/dports/lang/rust
larryv at macports.org
larryv at macports.org
Wed Mar 13 22:41:30 PDT 2013
Revision: 104051
https://trac.macports.org/changeset/104051
Author: larryv at macports.org
Date: 2013-03-13 22:41:30 -0700 (Wed, 13 Mar 2013)
Log Message:
-----------
[sandbox] rust: Use patches directly from GitHub and my local Git repo.
Modified Paths:
--------------
users/larryv/dports/lang/rust/Portfile
users/larryv/dports/lang/rust/files/patch-configure.diff
users/larryv/dports/lang/rust/files/patch-non_apple_gcc.diff
users/larryv/dports/lang/rust/files/patch-src-etc-local_stage0.sh.diff
users/larryv/dports/lang/rust/files/patch-src-librusti-rusti.rc.diff
users/larryv/dports/lang/rust/files/patch-src-rustllvm-RustWrapper.cpp.diff
Modified: users/larryv/dports/lang/rust/Portfile
===================================================================
--- users/larryv/dports/lang/rust/Portfile 2013-03-14 05:37:23 UTC (rev 104050)
+++ users/larryv/dports/lang/rust/Portfile 2013-03-14 05:41:30 UTC (rev 104051)
@@ -78,6 +78,7 @@
# TODO: Remove when base fallback lists are updated (2.2?).
compiler.fallback-append macports-clang-3.2
+patch.pre_args -p1
patchfiles patch-configure.diff \
patch-src-etc-local_stage0.sh.diff \
patch-src-librusti-rusti.rc.diff \
Modified: users/larryv/dports/lang/rust/files/patch-configure.diff
===================================================================
--- users/larryv/dports/lang/rust/files/patch-configure.diff 2013-03-14 05:37:23 UTC (rev 104050)
+++ users/larryv/dports/lang/rust/files/patch-configure.diff 2013-03-14 05:41:30 UTC (rev 104051)
@@ -1,7 +1,7 @@
-diff --git configure configure
+diff --git a/configure b/configure
index f2afa2d..e6c859f 100755
---- configure
-+++ configure
+--- a/configure
++++ b/configure
@@ -234,17 +234,7 @@ need_cmd sed
msg "inspecting environment"
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 05:37:23 UTC (rev 104050)
+++ users/larryv/dports/lang/rust/files/patch-non_apple_gcc.diff 2013-03-14 05:41:30 UTC (rev 104051)
@@ -1,7 +1,7 @@
-diff --git mk/libuv/ia32/mac/src/libuv/run-benchmarks.target.mk mk/libuv/ia32/mac/src/libuv/run-benchmarks.target.mk
+diff --git a/mk/libuv/ia32/mac/src/libuv/run-benchmarks.target.mk b/mk/libuv/ia32/mac/src/libuv/run-benchmarks.target.mk
index b8cc0a1..b72d2da 100644
---- mk/libuv/ia32/mac/src/libuv/run-benchmarks.target.mk
-+++ mk/libuv/ia32/mac/src/libuv/run-benchmarks.target.mk
+--- a/mk/libuv/ia32/mac/src/libuv/run-benchmarks.target.mk
++++ b/mk/libuv/ia32/mac/src/libuv/run-benchmarks.target.mk
@@ -14,8 +14,7 @@ DEFS_Debug := '-D_LARGEFILE_SOURCE' \
CFLAGS_Debug := -Os \
-gdwarf-2 \
@@ -22,10 +22,10 @@
-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
+diff --git a/mk/libuv/ia32/mac/src/libuv/run-tests.target.mk b/mk/libuv/ia32/mac/src/libuv/run-tests.target.mk
index be0c2c6..c48674e 100644
---- mk/libuv/ia32/mac/src/libuv/run-tests.target.mk
-+++ mk/libuv/ia32/mac/src/libuv/run-tests.target.mk
+--- a/mk/libuv/ia32/mac/src/libuv/run-tests.target.mk
++++ b/mk/libuv/ia32/mac/src/libuv/run-tests.target.mk
@@ -14,8 +14,7 @@ DEFS_Debug := '-D_LARGEFILE_SOURCE' \
CFLAGS_Debug := -Os \
-gdwarf-2 \
@@ -46,10 +46,10 @@
-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
+diff --git a/mk/libuv/ia32/mac/src/libuv/uv.target.mk b/mk/libuv/ia32/mac/src/libuv/uv.target.mk
index 9838606..427fca2 100644
---- mk/libuv/ia32/mac/src/libuv/uv.target.mk
-+++ mk/libuv/ia32/mac/src/libuv/uv.target.mk
+--- a/mk/libuv/ia32/mac/src/libuv/uv.target.mk
++++ b/mk/libuv/ia32/mac/src/libuv/uv.target.mk
@@ -17,8 +17,7 @@ DEFS_Debug := '-D_LARGEFILE_SOURCE' \
CFLAGS_Debug := -Os \
-gdwarf-2 \
@@ -70,10 +70,10 @@
-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
+diff --git a/mk/libuv/x86_64/mac/src/libuv/run-benchmarks.target.mk b/mk/libuv/x86_64/mac/src/libuv/run-benchmarks.target.mk
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
+--- a/mk/libuv/x86_64/mac/src/libuv/run-benchmarks.target.mk
++++ b/mk/libuv/x86_64/mac/src/libuv/run-benchmarks.target.mk
@@ -14,8 +14,7 @@ DEFS_Debug := '-D_LARGEFILE_SOURCE' \
CFLAGS_Debug := -Os \
-gdwarf-2 \
@@ -94,10 +94,10 @@
-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
+diff --git a/mk/libuv/x86_64/mac/src/libuv/run-tests.target.mk b/mk/libuv/x86_64/mac/src/libuv/run-tests.target.mk
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
+--- a/mk/libuv/x86_64/mac/src/libuv/run-tests.target.mk
++++ b/mk/libuv/x86_64/mac/src/libuv/run-tests.target.mk
@@ -14,8 +14,7 @@ DEFS_Debug := '-D_LARGEFILE_SOURCE' \
CFLAGS_Debug := -Os \
-gdwarf-2 \
@@ -118,10 +118,10 @@
-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
+diff --git a/mk/libuv/x86_64/mac/src/libuv/uv.target.mk b/mk/libuv/x86_64/mac/src/libuv/uv.target.mk
index 385a64c..6a348a1 100644
---- mk/libuv/x86_64/mac/src/libuv/uv.target.mk
-+++ mk/libuv/x86_64/mac/src/libuv/uv.target.mk
+--- a/mk/libuv/x86_64/mac/src/libuv/uv.target.mk
++++ b/mk/libuv/x86_64/mac/src/libuv/uv.target.mk
@@ -17,8 +17,7 @@ DEFS_Debug := '-D_LARGEFILE_SOURCE' \
CFLAGS_Debug := -Os \
-gdwarf-2 \
@@ -142,10 +142,10 @@
-fno-strict-aliasing \
-Wall \
-Wendif-labels \
-diff --git mk/platform.mk mk/platform.mk
+diff --git a/mk/platform.mk b/mk/platform.mk
index d2f8745..12fb7e2 100644
---- mk/platform.mk
-+++ mk/platform.mk
+--- a/mk/platform.mk
++++ b/mk/platform.mk
@@ -101,8 +101,8 @@ ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
# approaches welcome!
#
Modified: users/larryv/dports/lang/rust/files/patch-src-etc-local_stage0.sh.diff
===================================================================
--- users/larryv/dports/lang/rust/files/patch-src-etc-local_stage0.sh.diff 2013-03-14 05:37:23 UTC (rev 104050)
+++ users/larryv/dports/lang/rust/files/patch-src-etc-local_stage0.sh.diff 2013-03-14 05:41:30 UTC (rev 104051)
@@ -1,7 +1,24 @@
---- src/etc/local_stage0.sh.orig 2012-12-18 18:29:12.000000000 -0500
-+++ src/etc/local_stage0.sh 2013-03-09 17:26:42.000000000 -0500
-@@ -46,3 +46,4 @@
+From 1d315aac4403f22274fceab3e22ec1cdb95bad78 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lawrence=20Vela=CC=81zquez?= <larryv at alum.mit.edu>
+Date: Tue, 12 Mar 2013 03:34:14 -0400
+Subject: [PATCH] Copy libsyntax from local Rust to stage0.
+
+The local_stage0 script was not updated after commit 7dcbaed renamed
+librustsyntax to libsyntax, so builds using local Rust fail due to
+missing libsyntax.
+---
+ src/etc/local_stage0.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/etc/local_stage0.sh b/src/etc/local_stage0.sh
+index e4d7b61..5898bc5 100755
+--- a/src/etc/local_stage0.sh
++++ b/src/etc/local_stage0.sh
+@@ -46,3 +46,4 @@ cp ${PREFIX}/lib/rustc/${TARG_DIR}/${LIBDIR}/* ${TARG_DIR}/stage0/${LIBDIR}/
cp ${PREFIX}/lib/librust*${LIB_SUF} ${TARG_DIR}/stage0/${LIBDIR}/
cp ${PREFIX}/lib/libcore*${LIB_SUF} ${TARG_DIR}/stage0/${LIBDIR}/
cp ${PREFIX}/lib/libstd*${LIB_SUF} ${TARG_DIR}/stage0/${LIBDIR}/
+cp ${PREFIX}/lib/libsyntax*${LIB_SUF} ${TARG_DIR}/stage0/${LIBDIR}/
+--
+1.7.10
+
Modified: users/larryv/dports/lang/rust/files/patch-src-librusti-rusti.rc.diff
===================================================================
--- users/larryv/dports/lang/rust/files/patch-src-librusti-rusti.rc.diff 2013-03-14 05:37:23 UTC (rev 104050)
+++ users/larryv/dports/lang/rust/files/patch-src-librusti-rusti.rc.diff 2013-03-14 05:41:30 UTC (rev 104051)
@@ -9,8 +9,8 @@
diff --git a/src/librusti/rusti.rc b/src/librusti/rusti.rc
index 906735d..80eedbb 100644
---- src/librusti/rusti.rc
-+++ src/librusti/rusti.rc
+--- a/src/librusti/rusti.rc
++++ b/src/librusti/rusti.rc
@@ -246,6 +246,9 @@ fn run(repl: Repl, input: ~str) -> Repl {
debug!("loop checking");
middle::check_loop::check_crate(ty_cx, crate);
Modified: users/larryv/dports/lang/rust/files/patch-src-rustllvm-RustWrapper.cpp.diff
===================================================================
--- users/larryv/dports/lang/rust/files/patch-src-rustllvm-RustWrapper.cpp.diff 2013-03-14 05:37:23 UTC (rev 104050)
+++ users/larryv/dports/lang/rust/files/patch-src-rustllvm-RustWrapper.cpp.diff 2013-03-14 05:41:30 UTC (rev 104051)
@@ -9,8 +9,8 @@
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp
index 86a302e..bb00f04 100644
---- src/rustllvm/RustWrapper.cpp
-+++ src/rustllvm/RustWrapper.cpp
+--- a/src/rustllvm/RustWrapper.cpp
++++ b/src/rustllvm/RustWrapper.cpp
@@ -290,6 +290,13 @@ void *RustMCJITMemoryManager::getPointerToNamedFunction(const std::string &Name,
void *Ptr = sys::DynamicLibrary::SearchForAddressOfSymbol(NameStr);
if (Ptr) return Ptr;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130313/ec4879b1/attachment.html>
More information about the macports-changes
mailing list