[103961] users/larryv/dports/lang/rust
larryv at macports.org
larryv at macports.org
Sun Mar 10 19:15:50 PDT 2013
Revision: 103961
https://trac.macports.org/changeset/103961
Author: larryv at macports.org
Date: 2013-03-10 19:15:50 -0700 (Sun, 10 Mar 2013)
Log Message:
-----------
[sandbox] rust: Revbump, add some upstream patches, fix livecheck.
Also add myself as maintainer. Might as well at this point.
Modified Paths:
--------------
users/larryv/dports/lang/rust/Portfile
Added Paths:
-----------
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-11 01:51:51 UTC (rev 103960)
+++ users/larryv/dports/lang/rust/Portfile 2013-03-11 02:15:50 UTC (rev 103961)
@@ -6,41 +6,41 @@
name rust
version 0.5
-revision 2
+revision 3
categories lang devel
platforms darwin
supported_archs i386 x86_64
# https://github.com/mozilla/rust/issues/2024
universal_variant no
license {MIT Apache-2} BSD zlib NCSA Permissive
-maintainers g5pw openmaintainer
+maintainers g5pw larryv
description Compiler for the Rust programming language
long_description This is a compiler for Rust, including standard \
libraries, tools and documentation.
homepage http://www.rust-lang.org
-# ===== stage0 snapshot compiler =====
-set stage0(date) 2012-12-19
-set stage0(rev) 8554d5e
-set stage0(platform) macos-${configure.build_arch}
+
+# stage0 snapshot compiler, see src/snapshots.txt in dist
+set stage0(date) 2012-12-19
+set stage0(rev) 8554d5e
+set stage0(platform) macos-${configure.build_arch}
switch ${configure.build_arch} {
i386 {
- set stage0(hash) 151ff211c01f0b7a1895b93ff0bc021bf1472346
- set stage0(rmd160) 300b17458073a8704817821bd5406189a264f765
- set stage0(sha256) 5e598d4c45ee2dd8b7f2b69d92f60d16e57991e796d76ca255a612357a5e48e0
+ set stage0(hash) 151ff211c01f0b7a1895b93ff0bc021bf1472346
+ set stage0(rmd160) 300b17458073a8704817821bd5406189a264f765
+ set stage0(sha256) 5e598d4c45ee2dd8b7f2b69d92f60d16e57991e796d76ca255a612357a5e48e0
}
x86_64 {
- set stage0(hash) e4564933f11b17f7dbd25b61032233693da21dc5
- set stage0(rmd160) 3d966bd2d17e3f2c74ed78f3674439c89d5a16ee
- set stage0(sha256) a2e287a683128e2e213e11c5b9f92e5e628eb63163591d61523549deb2e21f7d
+ set stage0(hash) e4564933f11b17f7dbd25b61032233693da21dc5
+ set stage0(rmd160) 3d966bd2d17e3f2c74ed78f3674439c89d5a16ee
+ set stage0(sha256) a2e287a683128e2e213e11c5b9f92e5e628eb63163591d61523549deb2e21f7d
}
}
-# ====================================
-
set stage0(dist) [join "rust stage0 ${stage0(date)} ${stage0(rev)}
${stage0(platform)} ${stage0(hash)}" -].tar.bz2
+
master_sites http://dl.rust-lang.org/dist:dist \
http://static.rust-lang.org/stage0-snapshots:stage0
distfiles ${distname}${extract.suffix}:dist \
@@ -61,14 +61,16 @@
}
patchfiles patch-configure.diff \
- patch-src-etc-local_stage0.sh.diff
+ patch-src-etc-local_stage0.sh.diff \
+ patch-src-librusti-rusti.rc.diff \
+ patch-src-rustllvm-RustWrapper.cpp.diff
post-patch {
reinplace "s/__BUILD_ARCH__/${configure.build_arch}/g" \
${worksrcpath}/configure
}
-# Upstream only supports GCC 4.4 and newer and Clang based on LLVM
-# 3.0svn and newer.
+# Upstream only supports gcc 4.4 and newer and clang based on LLVM
+# 3.0svn and newer. The allowed clang build could probably be tightened.
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 \
@@ -98,5 +100,6 @@
destroot.args VERBOSE=1
-livecheck.url ${homepage}/
-livecheck.regex "/release-(\\d\.\\d)/"
+livecheck.type regex
+livecheck.url ${homepage}
+livecheck.regex {/release-(\d\.\d)/}
Added: 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 (rev 0)
+++ users/larryv/dports/lang/rust/files/patch-src-etc-local_stage0.sh.diff 2013-03-11 02:15:50 UTC (rev 103961)
@@ -0,0 +1,7 @@
+--- 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 @@
+ 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}/
Added: users/larryv/dports/lang/rust/files/patch-src-librusti-rusti.rc.diff
===================================================================
--- users/larryv/dports/lang/rust/files/patch-src-librusti-rusti.rc.diff (rev 0)
+++ users/larryv/dports/lang/rust/files/patch-src-librusti-rusti.rc.diff 2013-03-11 02:15:50 UTC (rev 103961)
@@ -0,0 +1,26 @@
+From 9bf87bbf66227c132283ae59720f919601de9a56 Mon Sep 17 00:00:00 2001
+From: Patrick Walton <pcwalton at mimiga.net>
+Date: Fri, 21 Dec 2012 22:38:45 -0500
+Subject: [PATCH] rusti: Perform mode computation. Closes #4230.
+
+---
+ src/librusti/rusti.rc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/librusti/rusti.rc b/src/librusti/rusti.rc
+index 906735d..80eedbb 100644
+--- src/librusti/rusti.rc
++++ 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);
+
++ debug!("mode computation");
++ middle::mode::compute_modes(ty_cx, method_map, crate);
++
+ debug!("alt checking");
+ middle::check_alt::check_crate(ty_cx, method_map, crate);
+
+--
+1.7.10
+
Added: users/larryv/dports/lang/rust/files/patch-src-rustllvm-RustWrapper.cpp.diff
===================================================================
--- users/larryv/dports/lang/rust/files/patch-src-rustllvm-RustWrapper.cpp.diff (rev 0)
+++ users/larryv/dports/lang/rust/files/patch-src-rustllvm-RustWrapper.cpp.diff 2013-03-11 02:15:50 UTC (rev 103961)
@@ -0,0 +1,30 @@
+From 3ee1d3ebb81de199fc630a86933ac18c0a869482 Mon Sep 17 00:00:00 2001
+From: Patrick Walton <pcwalton at mimiga.net>
+Date: Sat, 22 Dec 2012 16:24:19 -0500
+Subject: [PATCH] rustllvm: Fix symbol resolution on Mac for rusti. rs=bugfix
+
+---
+ src/rustllvm/RustWrapper.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp
+index 86a302e..bb00f04 100644
+--- src/rustllvm/RustWrapper.cpp
++++ 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;
+
++ // If it wasn't found and if it starts with an underscore ('_') character,
++ // try again without the underscore.
++ if (NameStr[0] == '_') {
++ Ptr = sys::DynamicLibrary::SearchForAddressOfSymbol(NameStr+1);
++ if (Ptr) return Ptr;
++ }
++
+ if (AbortOnFailure)
+ report_fatal_error("Program used external function '" + Name +
+ "' which could not be resolved!");
+--
+1.7.10
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130310/c73e7e8a/attachment-0001.html>
More information about the macports-changes
mailing list