diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-02-19 23:12:03 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-02-19 23:12:03 +0000 |
| commit | c30463643e0f18200197fa7fc700805eac4d020c (patch) | |
| tree | 599f32d5195512f7b700bb1f68abdbda7ee45281 /user/rust/0019-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch | |
| parent | 3e7e0ccf80173731eef6d51f8a261b6058bfad72 (diff) | |
| parent | 3ad04696702c67ecbb84ee44d20b2489d77d841f (diff) | |
| download | packages-c30463643e0f18200197fa7fc700805eac4d020c.tar.gz packages-c30463643e0f18200197fa7fc700805eac4d020c.tar.bz2 packages-c30463643e0f18200197fa7fc700805eac4d020c.tar.xz packages-c30463643e0f18200197fa7fc700805eac4d020c.zip | |
Merge branch 'rust' into 'master'
user/rust: Bump to 1.31.1
This needs updated binaries from https://portage.smaeul.xyz/distfiles/adelie/
See merge request !131
Diffstat (limited to 'user/rust/0019-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch')
| -rw-r--r-- | user/rust/0019-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/user/rust/0019-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch b/user/rust/0019-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch new file mode 100644 index 000000000..4f4b42a9c --- /dev/null +++ b/user/rust/0019-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch @@ -0,0 +1,25 @@ +From 8d74dfc55bad7461bbbc26a83c4103cc419bbf50 Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Mon, 17 Sep 2018 01:32:20 +0000 +Subject: [PATCH 19/23] test/sysroot-crates-are-unstable: Fix test when rpath + is disabled + +Without this environment var, the test can't run rustc to find +the sysroot path. +--- + .../run-make-fulldeps/sysroot-crates-are-unstable/Makefile | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile +index a35174b3c2..9e77070685 100644 +--- a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile ++++ b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile +@@ -1,2 +1,4 @@ ++-include ../tools.mk ++ + all: +- python2.7 test.py ++ env '$(HOST_RPATH_ENV)' python2.7 test.py +-- +2.19.2 + |