From 948e0fdd5fc8a41f7bb9052b6888889f751fc51d Mon Sep 17 00:00:00 2001 From: Derek Straka Date: Thu, 17 Mar 2016 08:27:24 -0400 Subject: [PATCH] Remove patch that is no longer required in rust 1.7.0 Signed-off-by: Derek Straka --- ...01-platform.mk-avoid-choking-on-i586.patch | 27 ------------------- recipes-devtools/rust/rust-source.bb | 1 - 2 files changed, 28 deletions(-) delete mode 100644 recipes-devtools/rust/files/rust/0001-platform.mk-avoid-choking-on-i586.patch diff --git a/recipes-devtools/rust/files/rust/0001-platform.mk-avoid-choking-on-i586.patch b/recipes-devtools/rust/files/rust/0001-platform.mk-avoid-choking-on-i586.patch deleted file mode 100644 index bc4f61b..0000000 --- a/recipes-devtools/rust/files/rust/0001-platform.mk-avoid-choking-on-i586.patch +++ /dev/null @@ -1,27 +0,0 @@ -From af2eaed835d3b717552ea83e75f4c5e86e614979 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 - ---- - mk/platform.mk | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/mk/platform.mk b/mk/platform.mk -index 856a22d..0c90632 100644 ---- a/mk/platform.mk -+++ b/mk/platform.mk -@@ -14,7 +14,9 @@ - # would create a variable HOST_i686-darwin-macos with the value - # i386. - define DEF_HOST_VAR -- HOST_$(1) = $(subst i686,i386,$(word 1,$(subst -, ,$(1)))) -+ HOST_$(1) = $(subst i686,i386,\ -+ $(subst i586,i386,\ -+ $(word 1,$(subst -, ,$(1))))) - endef - $(foreach t,$(CFG_TARGET),$(eval $(call DEF_HOST_VAR,$(t)))) - $(foreach t,$(CFG_TARGET),$(info cfg: host for $(t) is $(HOST_$(t)))) --- -2.4.10 - diff --git a/recipes-devtools/rust/rust-source.bb b/recipes-devtools/rust/rust-source.bb index e0a2185..80b098a 100644 --- a/recipes-devtools/rust/rust-source.bb +++ b/recipes-devtools/rust/rust-source.bb @@ -13,7 +13,6 @@ SRC_URI[rust.sha256sum] = "641037af7b7b6cad0b231cc20671f8a314fbf2f40fc0901d0b877 LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=eb87dba71cb424233bcce88db3ae2f1a" SRC_URI_append = "\ - file://rust/0001-platform.mk-avoid-choking-on-i586.patch \ file://rust/0002-Target-add-default-target.json-path-libdir-rust-targ.patch \ file://rust/0003-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch \ file://rust/0004-mk-add-missing-CFG_LIBDIR_RELATIVE.patch \