From c19badf635ccf7b2e4b986fe1d885d405fd2d615 Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Sat, 24 Dec 2016 10:24:40 -0600 Subject: [PATCH] rust: drop unnecessary patch Not sure what version this patch appears to have become unnecessary but I verified it by checking the output in build/tmp/sstate-control/manifest-x86_64-rust-native.populate_sysroot and the installed files and their paths didn't change with and without this patch. Signed-off-by: Doug Goldstein --- ...3-mk-add-missing-CFG_LIBDIR_RELATIVE.patch | 27 ------------------- recipes-devtools/rust/rust_1.12.1.bb | 1 - 2 files changed, 28 deletions(-) delete mode 100644 recipes-devtools/rust/files/rust-1.12.1/0003-mk-add-missing-CFG_LIBDIR_RELATIVE.patch diff --git a/recipes-devtools/rust/files/rust-1.12.1/0003-mk-add-missing-CFG_LIBDIR_RELATIVE.patch b/recipes-devtools/rust/files/rust-1.12.1/0003-mk-add-missing-CFG_LIBDIR_RELATIVE.patch deleted file mode 100644 index dad4b4e..0000000 --- a/recipes-devtools/rust/files/rust-1.12.1/0003-mk-add-missing-CFG_LIBDIR_RELATIVE.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 128503bf447e82b9e99bea8ef83294a6446036b5 Mon Sep 17 00:00:00 2001 -From: Cody P Schafer -Date: Tue, 18 Nov 2014 13:48:14 -0500 -Subject: [PATCH 03/10] mk: add missing CFG_LIBDIR_RELATIVE - ---- - mk/grammar.mk | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mk/grammar.mk b/mk/grammar.mk -index 0d527bd..926f247 100644 ---- a/mk/grammar.mk -+++ b/mk/grammar.mk -@@ -11,8 +11,8 @@ - BG = $(CFG_BUILD_DIR)/grammar/ - SG = $(S)src/grammar/ - B = $(CFG_BUILD_DIR)/$(CFG_BUILD)/stage2/ --L = $(B)lib/rustlib/$(CFG_BUILD)/lib --LD = $(CFG_BUILD)/stage2/lib/rustlib/$(CFG_BUILD)/lib/ -+L = $(B)$(CFG_LIBDIR_RELATIVE)/rustlib/$(CFG_BUILD)/lib -+LD = $(CFG_BUILD)/stage2/$(CFG_LIBDIR_RELATIVE)/rustlib/$(CFG_BUILD)/lib/ - RUSTC = $(STAGE2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) - ifeq ($(CFG_OSTYPE),apple-darwin) - FLEX_LDFLAGS=-ll --- -2.10.0 - diff --git a/recipes-devtools/rust/rust_1.12.1.bb b/recipes-devtools/rust/rust_1.12.1.bb index 78b9185..d8e7556 100644 --- a/recipes-devtools/rust/rust_1.12.1.bb +++ b/recipes-devtools/rust/rust_1.12.1.bb @@ -9,7 +9,6 @@ DEPENDS += "cmake-native" SRC_URI += " \ file://rust-${PV}/0001-Target-add-default-target.json-path-libdir-rust-targ.patch \ file://rust-${PV}/0002-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch \ - file://rust-${PV}/0003-mk-add-missing-CFG_LIBDIR_RELATIVE.patch \ file://rust-${PV}/0005-std-thread_local-workaround-for-NULL-__dso_handle.patch \ file://rust-${PV}/0006-mk-install-use-disable-rewrite-paths.patch \ file://rust-${PV}/0007-Allow-overriding-crate_hash-with-C-crate_hash.patch \