[107750] trunk/dports/lang/rust
g5pw at macports.org
g5pw at macports.org
Thu Jul 4 23:01:29 PDT 2013
Revision: 107750
https://trac.macports.org/changeset/107750
Author: g5pw at macports.org
Date: 2013-07-04 23:01:29 -0700 (Thu, 04 Jul 2013)
Log Message:
-----------
lang/rust:
bump to 0.7 (closes #39637)
Modified Paths:
--------------
trunk/dports/lang/rust/Portfile
trunk/dports/lang/rust/files/patch-configure.diff
Added Paths:
-----------
trunk/dports/lang/rust/files/src-etc-local_stage0.sh.diff
Modified: trunk/dports/lang/rust/Portfile
===================================================================
--- trunk/dports/lang/rust/Portfile 2013-07-05 00:59:16 UTC (rev 107749)
+++ trunk/dports/lang/rust/Portfile 2013-07-05 06:01:29 UTC (rev 107750)
@@ -6,7 +6,7 @@
PortGroup compiler_blacklist_versions 1.0
name rust
-version 0.6
+version 0.7
categories lang devel
platforms darwin
supported_archs i386 x86_64
@@ -36,27 +36,26 @@
master_sites http://static.rust-lang.org/dist:dist
distfiles [suffix ${distname}]:dist
checksums [suffix ${distname}] \
- rmd160 429c9727a228dc734395c0d54bf151e3bcb2d014 \
- sha256 e11cb529a1e20f27d99033181a9e0e131817136b46d2742f0fa1afa1210053e5
+ rmd160 986ec4f776c9b02d66cf191aa52aceff0743e5c1 \
+ sha256 0b88b8a4489382e0a69214eaab88e2e7c316ec33c164af0d3b53630b17590df0 \
-
# Select the snapshot compiler; see src/snapshots.txt in distribution.
set stage0(distdir) rust-stage0
-set stage0(date) 2013-03-28
-set stage0(rev) f7a2371
+set stage0(date) 2013-06-23
+set stage0(rev) f827561
platform darwin i386 {
set stage0(platform) macos-${configure.build_arch}
switch ${configure.build_arch} {
x86_64 {
- set stage0(hash) fbd3feec8dd17a6b6c8df114e6e9b4cd17cc6172
- set stage0(rmd160) a9bd2a854f107dbfe1a7c6a8d142bf45cba8909d
- set stage0(sha256) aed0c5f4b14a7ede41b08ad122e36a233fadfefe3c3f3e974d39442deab01897
+ set stage0(hash) b34fdf3845f8ef4760817007d8ef820cd32f2e07
+ set stage0(rmd160) 9ee3de67efe0ae4404f64cf71072a015269d7936
+ set stage0(sha256) ec7b5a6cd25cb85b45cc354cab9fa266c193b6be2581e3624494171a86114b6b
}
i386 -
default {
- set stage0(hash) 2e05a33716fc4982db53946c3b0dccf0194826fe
- set stage0(rmd160) 0865660ba2f864f8bbcb3022871fdbd2d6de1ea6
- set stage0(sha256) ad708818e8e6b684855b58c9a74dce1485dc7e5fad09370fe39324d4c74f8c27
+ set stage0(hash) 63ffbcf99b6853d7840bdfe01380068518d0e466
+ set stage0(rmd160) 33799fbefb2d958c7c729ae01c32f5f8aa3f0eb2
+ set stage0(sha256) 62617c3c2cb0b942afebda8c02315a5c23cdb344a4f047ea9ab73b648525376d
}
}
set stage0(distfile) [join "rust stage0 ${stage0(date)}
@@ -94,8 +93,14 @@
macports-dragonegg-3.2 macports-dragonegg-3.3 \
macports-gcc-4.2 macports-gcc-4.3 macports-gcc-4.4
-patch.pre_args -p1
patchfiles patch-configure.diff
+
+# Here to fix a bug in local_stage0.sh
+# Pull request submitted upstream
+# TODO: remove patch when http://github.com/mozilla/rust/pull/7586
+# is resolved.
+patchfiles-append src-etc-local_stage0.sh.diff
+
post-patch {
# TODO: Use patches for these when the build system stops changing
# so much between releases.
Modified: trunk/dports/lang/rust/files/patch-configure.diff
===================================================================
--- trunk/dports/lang/rust/files/patch-configure.diff 2013-07-05 00:59:16 UTC (rev 107749)
+++ trunk/dports/lang/rust/files/patch-configure.diff 2013-07-05 06:01:29 UTC (rev 107750)
@@ -1,8 +1,6 @@
-diff --git a/configure b/configure
-index 71beb82..9353a3f 100755
---- a/configure
-+++ b/configure
-@@ -401,7 +401,7 @@ fi
+--- configure 2013-07-02 03:38:47.000000000 +0200
++++ configure.new 2013-07-03 23:28:50.000000000 +0200
+@@ -402,7 +402,7 @@
step_msg "looking for build programs"
probe_need CFG_PERL perl
@@ -11,41 +9,57 @@
probe_need CFG_PYTHON python2.7 python2.6 python2 python
python_version=$($CFG_PYTHON -V 2>&1)
-@@ -420,8 +420,10 @@ else
+@@ -421,9 +421,11 @@
probe_need CFG_GIT git
fi
-probe CFG_CLANG clang++
--probe CFG_GCC gcc
+# CFG_CLANG and CFG_GCC will be from the same compiler suite now, but we
+# don't care because we're forcing a particular compiler anyway.
+probe CFG_CLANG $CXX
+ probe CFG_CCACHE ccache
+-probe CFG_GCC gcc
+probe CFG_GCC $CC
probe CFG_LD ld
probe CFG_VALGRIND valgrind
probe CFG_PERF perf
-@@ -814,20 +816,11 @@ do
- --enable-bindings=none --disable-threads \
- --disable-pthreads"
+@@ -836,35 +838,10 @@
+ # Disable unused LLVM features
+ LLVM_OPTS="$LLVM_DBG_OPTS --disable-docs --enable-bindings=none"
-- if [ "$CFG_C_COMPILER" = "clang" ]
-- then
+- case "$CFG_C_COMPILER" in
+- ("ccache clang")
+- LLVM_CXX_32="ccache clang++ -m32 -Qunused-arguments"
+- LLVM_CC_32="ccache clang -m32 -Qunused-arguments"
+-
+- LLVM_CXX_64="ccache clang++ -Qunused-arguments"
+- LLVM_CC_64="ccache clang -Qunused-arguments"
+- ;;
+- ("clang")
- LLVM_CXX_32="clang++ -m32"
- LLVM_CC_32="clang -m32"
-
- LLVM_CXX_64="clang++"
- LLVM_CC_64="clang"
-- else
+- ;;
+- ("ccache gcc")
+- LLVM_CXX_32="ccache g++ -m32"
+- LLVM_CC_32="ccache gcc -m32"
+-
+- LLVM_CXX_64="ccache g++"
+- LLVM_CC_64="ccache gcc"
+- ;;
+- ("gcc")
- LLVM_CXX_32="g++ -m32"
- LLVM_CC_32="gcc -m32"
-+ LLVM_CXX_32="$CXX -m32"
-+ LLVM_CC_32="$CC -m32"
-
+-
- LLVM_CXX_64="g++"
- LLVM_CC_64="gcc"
-- fi
-+ LLVM_CXX_64="$CXX"
-+ LLVM_CC_64="$CC"
+- esac
++ LLVM_CXX_32="$CXX -m32"
++ LLVM_CC_32="$CC -m32"
++ LLVM_CXX_64="$CXX"
++ LLVM_CC_64="$CC"
LLVM_CFLAGS_32="-m32"
LLVM_CXXFLAGS_32="-m32"
Added: trunk/dports/lang/rust/files/src-etc-local_stage0.sh.diff
===================================================================
--- trunk/dports/lang/rust/files/src-etc-local_stage0.sh.diff (rev 0)
+++ trunk/dports/lang/rust/files/src-etc-local_stage0.sh.diff 2013-07-05 06:01:29 UTC (rev 107750)
@@ -0,0 +1,11 @@
+--- src/etc/local_stage0.sh 2013-06-06 03:36:23.000000000 +0200
++++ src/etc/local_stage0.sh.new 2013-07-04 08:33:04.000000000 +0200
+@@ -43,7 +43,7 @@
+
+ cp ${PREFIX}/bin/rustc ${TARG_DIR}/stage0/bin/
+ cp ${PREFIX}/lib/rustc/${TARG_DIR}/${LIBDIR}/* ${TARG_DIR}/stage0/${LIBDIR}/
++cp ${PREFIX}/lib/libextra*${LIB_SUF} ${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}/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130704/9c6f00a7/attachment.html>
More information about the macports-changes
mailing list