cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to rust-1.12.1

Browse Source 
For release note see https://blog.rust-lang.org/2016/10/20/Rust-1.12.1.html

Please note, semarie rebuilded the bootstrap due to a bug in rustc: 1.12.0
wasn't able to rebuild 1.12.1 without intrusive patches in the build system

From semarie, ok ajacoutot
This commit is contained in:
danj 2016-10-25 17:08:07 +00:00
parent 6b1847a060
commit 90c749b360
7 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lang/rust/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.30 2016/10/05 16:48:10 danj Exp $
# $OpenBSD: Makefile,v 1.31 2016/10/25 17:08:07 danj Exp $
# snapshots are only available for amd64, for now
ONLY_FOR_ARCHS = amd64
@ -7,12 +7,12 @@ PKG_ARCH-doc = *
COMMENT-main = compiler for Rust Language
COMMENT-doc = html documentation for rustc
V = 1.12.0
BV = 1.12.0-20160929
V = 1.12.1
BV = 1.12.1-20161021
DISTNAME = rustc-${V}-src
#RUST_HASH != echo -n ${V} | md5 | cut -c1-8
RUST_HASH = 40393716
RUST_HASH = 5c6cf767
SUBST_VARS += RUST_HASH
PKGNAME = rust-${V}
@ -87,8 +87,8 @@ CONFIGURE_ARGS += --disable-valgrind-rpass \
--prefix="${LOCALBASE}" \
--mandir="${LOCALBASE}/man"
# VERSION and BOOTSTRAP are same version
.if ${V} == ${BV:C/-[0-9]+$//}
# VERSION and BOOTSTRAP are same major version
.if ${V:C/\.[0-9]+$//} == ${BV:C/\.[0-9]+-[0-9]+$//}
CONFIGURE_ARGS += --enable-local-rebuild
.endif

8
lang/rust/distinfo
View File

@ -1,4 +1,4 @@
SHA256 (rust/rustc-1.12.0-src.tar.gz) = rFkH1vqWwZvVkB2NmTg/uHVRJ1cerT1AcMzpwftfM3o=
SHA256 (rust/rustc-bootstrap-amd64-1.12.0-20160929.tar.gz) = VjewvFzkgatD8nKLpLmaCtWkRecoNWDNOd3GrdYH42U=
SIZE (rust/rustc-1.12.0-src.tar.gz) = 27501444
SIZE (rust/rustc-bootstrap-amd64-1.12.0-20160929.tar.gz) = 24459997
SHA256 (rust/rustc-1.12.1-src.tar.gz) = l5E65MslVhiqrNGlNLEfNDY0sECzJlYlDQnY2ewC09w=
SHA256 (rust/rustc-bootstrap-amd64-1.12.1-20161021.tar.gz) = KNG9v6HBcpbf/rr2IaaPkHgjNQ1EwothEswHPdNV4mo=
SIZE (rust/rustc-1.12.1-src.tar.gz) = 27511443
SIZE (rust/rustc-bootstrap-amd64-1.12.1-20161021.tar.gz) = 25133752

10
lang/rust/patches/patch-configure
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-configure,v 1.12 2016/09/03 19:51:47 naddy Exp $
$OpenBSD: patch-configure,v 1.13 2016/10/25 17:08:07 danj Exp $
Remove requirement for curl.
The snapshot isn't downloaded but copied by post-configure.
--- configure.orig Tue Aug 16 03:54:35 2016
+++ configure Sat Sep 3 13:35:30 2016
@@ -726,7 +726,7 @@ if [ -n "$CFG_ENABLE_ORBIT" ]; then putvar CFG_ENABLE_
--- configure.orig Wed Oct 19 23:51:02 2016
+++ configure Sat Oct 22 15:28:15 2016
@@ -737,7 +737,7 @@ if [ -n "$CFG_DISABLE_ORBIT" ]; then putvar CFG_DISABL
step_msg "looking for build programs"
@ -12,7 +12,7 @@ The snapshot isn't downloaded but copied by post-configure.
if [ -z "$CFG_PYTHON_PROVIDED" ]; then
probe_need CFG_PYTHON python2.7 python2 python
fi
@@ -877,7 +877,7 @@ then
@@ -899,7 +899,7 @@ then
fi
CMD="${CFG_LOCAL_RUST_ROOT}/bin/rustc${BIN_SUF}"

12
lang/rust/patches/patch-src_librustdoc_test_rs
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_librustdoc_test_rs,v 1.3 2016/08/31 08:33:19 landry Exp $
$OpenBSD: patch-src_librustdoc_test_rs,v 1.4 2016/10/25 17:08:07 danj Exp $
fallback to CFG_PREFIX as default sysroot.
--- src/librustdoc/test.rs.orig Tue Aug 16 03:54:35 2016
+++ src/librustdoc/test.rs Fri Aug 19 06:40:11 2016
--- src/librustdoc/test.rs.orig Wed Oct 19 23:51:02 2016
+++ src/librustdoc/test.rs Sat Oct 22 15:28:15 2016
@@ -63,9 +63,16 @@ pub fn run(input: &str,
let input_path = PathBuf::from(input);
let input = config::Input::File(input_path.clone());
@ -21,9 +21,9 @@ fallback to CFG_PREFIX as default sysroot.
search_paths: libs.clone(),
crate_types: vec!(config::CrateTypeDylib),
externs: externs.clone(),
@@ -187,9 +194,16 @@ fn runtest(test: &str, cratename: &str, cfgs: Vec<Stri
let mut outputs = HashMap::new();
outputs.insert(OutputType::Exe, None);
@@ -184,9 +191,16 @@ fn runtest(test: &str, cratename: &str, cfgs: Vec<Stri
};
let outputs = OutputTypes::new(&[(OutputType::Exe, None)]);
+ let sysroot = match env::current_exe().ok() {
+ Some(mut p) => { p.pop(); p.pop(); p }

8
lang/rust/patches/patch-src_libstd_sys_unix_os_rs
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-src_libstd_sys_unix_os_rs,v 1.2 2016/06/09 04:20:10 semarie Exp $
$OpenBSD: patch-src_libstd_sys_unix_os_rs,v 1.3 2016/10/25 17:08:07 danj Exp $
argv0 isn't suitable as current_exe() in all cases.
--- src/libstd/sys/unix/os.rs.orig Mon May 23 18:29:00 2016
+++ src/libstd/sys/unix/os.rs Tue Jun 7 17:36:10 2016
@@ -235,13 +235,14 @@ pub fn current_exe() -> io::Result<PathBuf> {
--- src/libstd/sys/unix/os.rs.orig Wed Oct 19 23:51:03 2016
+++ src/libstd/sys/unix/os.rs Sat Oct 22 15:28:15 2016
@@ -246,13 +246,14 @@ pub fn current_exe() -> io::Result<PathBuf> {
argv.set_len(argv_len as usize);
if argv[0].is_null() {
return Err(io::Error::new(io::ErrorKind::Other,

8
lang/rust/patches/patch-src_test_run-pass_backtrace_rs
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-src_test_run-pass_backtrace_rs,v 1.2 2016/08/31 08:33:19 landry Exp $
$OpenBSD: patch-src_test_run-pass_backtrace_rs,v 1.3 2016/10/25 17:08:07 danj Exp $
Skip run-pass/backtrace as libbacktrace is disabled on openbsd.
--- src/test/run-pass/backtrace.rs.orig Mon Jul 4 20:04:09 2016
+++ src/test/run-pass/backtrace.rs Tue Jul 5 19:01:38 2016
@@ -115,7 +115,8 @@ fn runtest(me: &str) {
--- src/test/run-pass/backtrace.rs.orig Wed Oct 19 23:51:03 2016
+++ src/test/run-pass/backtrace.rs Sat Oct 22 15:28:15 2016
@@ -104,7 +104,8 @@ fn runtest(me: &str) {
}
fn main() {

8
lang/rust/patches/patch-src_tools_compiletest_src_runtest_rs
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-src_tools_compiletest_src_runtest_rs,v 1.1 2016/08/31 08:33:19 landry Exp $
$OpenBSD: patch-src_tools_compiletest_src_runtest_rs,v 1.2 2016/10/25 17:08:07 danj Exp $
use gmake to run-make testsuite
--- src/tools/compiletest/src/runtest.rs.orig Tue Aug 16 03:54:35 2016
+++ src/tools/compiletest/src/runtest.rs Fri Aug 19 06:40:11 2016
@@ -2043,7 +2043,7 @@ actual:\n\
--- src/tools/compiletest/src/runtest.rs.orig Wed Oct 19 23:51:03 2016
+++ src/tools/compiletest/src/runtest.rs Sat Oct 22 15:28:15 2016
@@ -2056,7 +2056,7 @@ actual:\n\
}
self.create_dir_racy(&tmpdir);