diff options
| author | Vanilla I. Shu <vanilla@FreeBSD.org> | 2015-09-03 15:22:07 +0000 |
|---|---|---|
| committer | Vanilla I. Shu <vanilla@FreeBSD.org> | 2015-09-03 15:22:07 +0000 |
| commit | 92219a48b98fca34e8dfcfce0e69bbdd2a2792ba (patch) | |
| tree | 208a438dd749bd9b7d80718d5685b8cb589d9182 /lang/rust/files | |
| parent | Correct version range mistakes in bind vulnerabilities (diff) | |
1: Upgrade to 1.2.0.
2: add libedit to USES.
Notes
Notes:
svn path=/head/; revision=395967
Diffstat (limited to 'lang/rust/files')
| -rw-r--r-- | lang/rust/files/patch-configure | 22 | ||||
| -rw-r--r-- | lang/rust/files/patch-mk_main.mk | 11 | ||||
| -rw-r--r-- | lang/rust/files/patch-src_librustc__back_target_freebsd__base.rs | 12 |
3 files changed, 15 insertions, 30 deletions
diff --git a/lang/rust/files/patch-configure b/lang/rust/files/patch-configure index 2b90923d4cf9..4b278fcb1c6b 100644 --- a/lang/rust/files/patch-configure +++ b/lang/rust/files/patch-configure @@ -1,24 +1,10 @@ ---- configure.orig 2015-05-13 20:03:52 UTC +--- configure.orig 2015-08-04 19:28:47 UTC +++ configure -@@ -678,7 +678,6 @@ putvar CFG_BOOTSTRAP_KEY +@@ -696,7 +696,6 @@ putvar CFG_BOOTSTRAP_KEY step_msg "looking for build programs" -probe_need CFG_CURLORWGET curl wget - probe_need CFG_PYTHON python2.7 python2.6 python2 python - - python_version=$($CFG_PYTHON -V 2>&1) -@@ -805,13 +804,6 @@ then - putvar CFG_LOCAL_RUST_ROOT + if [ -z "$CFG_PYTHON_PROVIDED" ]; then + probe_need CFG_PYTHON python2.7 python2.6 python2 python fi - --# Force freebsd to build with clang; gcc doesn't like us there --if [ $CFG_OSTYPE = unknown-freebsd ] --then -- step_msg "on FreeBSD, forcing use of clang" -- CFG_ENABLE_CLANG=1 --fi -- - # Force bitrig to build with clang; gcc doesn't like us there - if [ $CFG_OSTYPE = unknown-bitrig ] - then diff --git a/lang/rust/files/patch-mk_main.mk b/lang/rust/files/patch-mk_main.mk new file mode 100644 index 000000000000..5288c86a336c --- /dev/null +++ b/lang/rust/files/patch-mk_main.mk @@ -0,0 +1,11 @@ +--- mk/main.mk.orig 2015-09-03 11:50:44 UTC ++++ mk/main.mk +@@ -107,7 +107,7 @@ ifneq ($(wildcard $(NON_BUILD_TARGET)),) + CFG_INFO := $(info cfg: non-build target triples $(NON_BUILD_TARGET)) + endif + +-CFG_RUSTC_FLAGS := $(RUSTFLAGS) ++CFG_RUSTC_FLAGS := $(RUSTFLAGS) -L%%LOCALBASE%%/lib + CFG_GCCISH_CFLAGS := + CFG_GCCISH_LINK_FLAGS := + diff --git a/lang/rust/files/patch-src_librustc__back_target_freebsd__base.rs b/lang/rust/files/patch-src_librustc__back_target_freebsd__base.rs deleted file mode 100644 index fc7a58f8d703..000000000000 --- a/lang/rust/files/patch-src_librustc__back_target_freebsd__base.rs +++ /dev/null @@ -1,12 +0,0 @@ ---- src/librustc_back/target/freebsd_base.rs.orig 2015-05-07 14:37:17 UTC -+++ src/librustc_back/target/freebsd_base.rs -@@ -19,9 +19,6 @@ pub fn opts() -> TargetOptions { - morestack: true, - has_rpath: true, - pre_link_args: vec!( -- "-L/usr/local/lib".to_string(), -- "-L/usr/local/lib/gcc46".to_string(), -- "-L/usr/local/lib/gcc44".to_string(), - ), - - .. Default::default() |