From c91dfe07faf88b723cd5744341395a9d84212ee1 Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Mon, 24 Nov 2014 15:26:08 -0500 Subject: [PATCH] refresh patches --- .../0001-platform.mk-avoid-choking-on-i586.patch | 2 +- ...r_rt-pass-LDFLAGS-from-CFG_GCCISH_LINK_.patch | 2 +- ...fault-target.json-path-libdir-rust-targ.patch | 2 +- ...-use-RUSTFLAGS-to-override-target-libs-.patch | 2 +- ...0005-mk-add-missing-CFG_LIBDIR_RELATIVE.patch | 2 +- ...port-bindir-and-extend-libdir-to-non-bl.patch | 2 +- ...07-XXX-remove-conflicting-realpath-hack.patch | 16 ++++++++-------- ...08-XXX-configure-unneeded-windows-check.patch | 6 +++--- .../0009-Parallelize-submake-invocations.patch | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/recipes/rust/files/0001-platform.mk-avoid-choking-on-i586.patch b/recipes/rust/files/0001-platform.mk-avoid-choking-on-i586.patch index 7aefba6..2ba9edd 100644 --- a/recipes/rust/files/0001-platform.mk-avoid-choking-on-i586.patch +++ b/recipes/rust/files/0001-platform.mk-avoid-choking-on-i586.patch @@ -1,4 +1,4 @@ -From 7e1c5942259b06bd96ff033667a38bdf1f9b2253 Mon Sep 17 00:00:00 2001 +From e9a9e2995d6e55fdab56b10549928218df8d0240 Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Sat, 15 Nov 2014 20:12:48 -0500 Subject: [PATCH 1/9] platform.mk: avoid choking on i586 diff --git a/recipes/rust/files/0002-mk-rt-compiler_rt-pass-LDFLAGS-from-CFG_GCCISH_LINK_.patch b/recipes/rust/files/0002-mk-rt-compiler_rt-pass-LDFLAGS-from-CFG_GCCISH_LINK_.patch index 4dbd15b..5e64455 100644 --- a/recipes/rust/files/0002-mk-rt-compiler_rt-pass-LDFLAGS-from-CFG_GCCISH_LINK_.patch +++ b/recipes/rust/files/0002-mk-rt-compiler_rt-pass-LDFLAGS-from-CFG_GCCISH_LINK_.patch @@ -1,4 +1,4 @@ -From 895c63ef1aa7dc90f74d6b269658281097c32113 Mon Sep 17 00:00:00 2001 +From 34cf235dd2e8d357f3aac42d0ff17afc92e3c881 Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Mon, 17 Nov 2014 16:14:15 -0500 Subject: [PATCH 2/9] mk/rt/compiler_rt: pass LDFLAGS from diff --git a/recipes/rust/files/0003-Target-add-default-target.json-path-libdir-rust-targ.patch b/recipes/rust/files/0003-Target-add-default-target.json-path-libdir-rust-targ.patch index 9dc813a..a3bc2a9 100644 --- a/recipes/rust/files/0003-Target-add-default-target.json-path-libdir-rust-targ.patch +++ b/recipes/rust/files/0003-Target-add-default-target.json-path-libdir-rust-targ.patch @@ -1,4 +1,4 @@ -From 13a5bb5a40462e8a59c838252f932422e405f773 Mon Sep 17 00:00:00 2001 +From c7b10c32d790dbdca3c2b961f237d79431871d36 Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Tue, 18 Nov 2014 01:40:21 -0500 Subject: [PATCH 3/9] Target: add default target.json path: diff --git a/recipes/rust/files/0004-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch b/recipes/rust/files/0004-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch index 6a15971..20bebe7 100644 --- a/recipes/rust/files/0004-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch +++ b/recipes/rust/files/0004-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch @@ -1,4 +1,4 @@ -From d5531e29444ad7dd03544e4ece0dc30a10313ad0 Mon Sep 17 00:00:00 2001 +From 1fd138dbc5ccf1197baad97f1ab8d169f82053cf Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Tue, 18 Nov 2014 14:52:56 -0500 Subject: [PATCH 4/9] mk: for stage0, use RUSTFLAGS to override target libs dir diff --git a/recipes/rust/files/0005-mk-add-missing-CFG_LIBDIR_RELATIVE.patch b/recipes/rust/files/0005-mk-add-missing-CFG_LIBDIR_RELATIVE.patch index 603fc7a..9f9d6ff 100644 --- a/recipes/rust/files/0005-mk-add-missing-CFG_LIBDIR_RELATIVE.patch +++ b/recipes/rust/files/0005-mk-add-missing-CFG_LIBDIR_RELATIVE.patch @@ -1,4 +1,4 @@ -From e56ab96d8a0fd3d75aef114cbb384047532f73f1 Mon Sep 17 00:00:00 2001 +From 252e607f9942874c16d45e0c9146ac992b614cb0 Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Tue, 18 Nov 2014 13:48:14 -0500 Subject: [PATCH 5/9] mk: add missing CFG_LIBDIR_RELATIVE diff --git a/recipes/rust/files/0006-configure-support-bindir-and-extend-libdir-to-non-bl.patch b/recipes/rust/files/0006-configure-support-bindir-and-extend-libdir-to-non-bl.patch index da6d718..c880624 100644 --- a/recipes/rust/files/0006-configure-support-bindir-and-extend-libdir-to-non-bl.patch +++ b/recipes/rust/files/0006-configure-support-bindir-and-extend-libdir-to-non-bl.patch @@ -1,4 +1,4 @@ -From b371c603db7f0c5c8b4b856f3c0e3170047d4a39 Mon Sep 17 00:00:00 2001 +From c622cb85bdd3d4d5349240b1431854ac9ee250ac Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Mon, 24 Nov 2014 13:10:15 -0500 Subject: [PATCH 6/9] configure: support --bindir, and extend libdir to diff --git a/recipes/rust/files/0007-XXX-remove-conflicting-realpath-hack.patch b/recipes/rust/files/0007-XXX-remove-conflicting-realpath-hack.patch index 7fffe11..e609dd1 100644 --- a/recipes/rust/files/0007-XXX-remove-conflicting-realpath-hack.patch +++ b/recipes/rust/files/0007-XXX-remove-conflicting-realpath-hack.patch @@ -1,24 +1,24 @@ -From b95d0cc6e35da533920c39cbcf6acc7fb1b1bec3 Mon Sep 17 00:00:00 2001 +From 9131d50decdde98fac37164b42a339f7ccf33c5b Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Mon, 24 Nov 2014 13:20:57 -0500 Subject: [PATCH 7/9] XXX: remove conflicting realpath hack --- - configure | 14 +------------- - 1 file changed, 1 insertion(+), 13 deletions(-) + configure | 13 +------------ + 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/configure b/configure -index 4176631..17e0007 100755 +index 4176631..b10b427 100755 --- a/configure +++ b/configure -@@ -550,20 +550,8 @@ CFG_TARGET=$(to_llvm_triple $CFG_TARGET) +@@ -550,20 +550,9 @@ CFG_TARGET=$(to_llvm_triple $CFG_TARGET) if [ "$CFG_OSTYPE" = "pc-windows-gnu" ] then CFG_LIBDIR_RELATIVE=bin -else - CFG_LIBDIR_RELATIVE=lib --fi -- + fi + -valopt libdir "${CFG_PREFIX}/${CFG_LIBDIR_RELATIVE}" "install libraries (do not set it on windows platform)" - -case "$CFG_LIBDIR" in @@ -27,7 +27,7 @@ index 4176631..17e0007 100755 - *) - err "libdir must begin with the prefix. Use --prefix to set it accordingly.";; -esac - +- -CFG_LIBDIR_RELATIVE=`echo ${CFG_LIBDIR} | cut -c$((${#CFG_PREFIX}+${CAT_INC}))-` +valopt libdir "${CFG_PREFIX}/${CFG_LIBDIR_RELATIVE}" "install libraries" diff --git a/recipes/rust/files/0008-XXX-configure-unneeded-windows-check.patch b/recipes/rust/files/0008-XXX-configure-unneeded-windows-check.patch index 1deffad..2124b63 100644 --- a/recipes/rust/files/0008-XXX-configure-unneeded-windows-check.patch +++ b/recipes/rust/files/0008-XXX-configure-unneeded-windows-check.patch @@ -1,4 +1,4 @@ -From c1a1dd39f53cb79e766699198e05e13ba5d588bc Mon Sep 17 00:00:00 2001 +From 9d3d00c93160d026b5b8895920ce21bdebe19af3 Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Mon, 24 Nov 2014 13:22:43 -0500 Subject: [PATCH 8/9] XXX: configure: unneeded windows check @@ -8,10 +8,10 @@ Subject: [PATCH 8/9] XXX: configure: unneeded windows check 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 17e0007..4baa18a 100755 +index b10b427..a967fb2 100755 --- a/configure +++ b/configure -@@ -553,8 +553,8 @@ then +@@ -554,8 +554,8 @@ fi valopt libdir "${CFG_PREFIX}/${CFG_LIBDIR_RELATIVE}" "install libraries" diff --git a/recipes/rust/files/0009-Parallelize-submake-invocations.patch b/recipes/rust/files/0009-Parallelize-submake-invocations.patch index e0f2b25..dedd199 100644 --- a/recipes/rust/files/0009-Parallelize-submake-invocations.patch +++ b/recipes/rust/files/0009-Parallelize-submake-invocations.patch @@ -1,4 +1,4 @@ -From 7bd5c6edc254de42b83113f000dcaaaac653d332 Mon Sep 17 00:00:00 2001 +From 0e058b076a33f26e902decf41da78c9d61a4bc63 Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Mon, 24 Nov 2014 13:54:42 -0500 Subject: [PATCH 9/9] Parallelize submake invocations