From 4ccca55f2ff33a0d533fd6d03c37a1af61fec44d Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Wed, 28 Dec 2016 16:25:26 -0600 Subject: [PATCH] rust: remove unused patches This patches handle changing the directories that things are installed in but appear to be unused. They were likely used before rust-cross was split out to not install files. Signed-off-by: Doug Goldstein --- ...mk-install-use-disable-rewrite-paths.patch | 30 ---------- ...o-disable-rewriting-of-install-paths.patch | 58 ------------------- recipes-devtools/rust/rust_1.12.1.bb | 2 - 3 files changed, 90 deletions(-) delete mode 100644 recipes-devtools/rust/files/rust-1.12.1/0006-mk-install-use-disable-rewrite-paths.patch delete mode 100644 recipes-devtools/rust/files/rust-installer-1.12.1/0001-add-option-to-disable-rewriting-of-install-paths.patch diff --git a/recipes-devtools/rust/files/rust-1.12.1/0006-mk-install-use-disable-rewrite-paths.patch b/recipes-devtools/rust/files/rust-1.12.1/0006-mk-install-use-disable-rewrite-paths.patch deleted file mode 100644 index 1c003b5..0000000 --- a/recipes-devtools/rust/files/rust-1.12.1/0006-mk-install-use-disable-rewrite-paths.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f8d4b1ea925789bca1aa6261017d63f5efa95c0f Mon Sep 17 00:00:00 2001 -From: Cody P Schafer -Date: Mon, 2 Mar 2015 13:34:59 -0500 -Subject: [PATCH 06/10] mk/install: use disable-rewrite-paths - -This stops the install scripts from doing work we've already handled. - -Path rewriting is only useful for prepackaged binary installers. ---- - mk/install.mk | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/mk/install.mk b/mk/install.mk -index d2e5449..e67650b 100644 ---- a/mk/install.mk -+++ b/mk/install.mk -@@ -12,7 +12,9 @@ RUN_INSTALLER = cd tmp/empty_dir && \ - sh ../../tmp/dist/$(1)/install.sh \ - --prefix="$(DESTDIR)$(CFG_PREFIX)" \ - --libdir="$(DESTDIR)$(CFG_LIBDIR)" \ -- --mandir="$(DESTDIR)$(CFG_MANDIR)" -+ --mandir="$(DESTDIR)$(CFG_MANDIR)" \ -+ "$(MAYBE_DISABLE_VERIFY)" \ -+ --disable-rewrite-paths - - install: - ifeq (root user, $(USER) $(patsubst %,user,$(SUDO_USER))) --- -2.10.0 - diff --git a/recipes-devtools/rust/files/rust-installer-1.12.1/0001-add-option-to-disable-rewriting-of-install-paths.patch b/recipes-devtools/rust/files/rust-installer-1.12.1/0001-add-option-to-disable-rewriting-of-install-paths.patch deleted file mode 100644 index 9471252..0000000 --- a/recipes-devtools/rust/files/rust-installer-1.12.1/0001-add-option-to-disable-rewriting-of-install-paths.patch +++ /dev/null @@ -1,58 +0,0 @@ -From c7daec775a917d9e3017bc35ea7d88cc9418f181 Mon Sep 17 00:00:00 2001 -From: Cody P Schafer -Date: Mon, 2 Mar 2015 13:27:49 -0500 -Subject: [PATCH] add option to disable rewriting of install paths - -This is intended for use by rust & cargo's `make install`, as in that -case: - - - these paths are typically built into the pre-install layout already - - attempting to do the replacement will be incorrect subdirectory - cases (ie: libdir=lib/foo) ---- - install-template.sh | 21 ++++++++++++--------- - 1 file changed, 12 insertions(+), 9 deletions(-) - -diff --git a/install-template.sh b/install-template.sh -index 042b955..4ecf430 100644 ---- a/install-template.sh -+++ b/install-template.sh -@@ -618,16 +618,18 @@ install_components() { - # Decide the destination of the file - local _file_install_path="$_dest_prefix/$_file" - -- if echo "$_file" | grep "^lib/" > /dev/null -- then -- local _f="$(echo "$_file" | sed 's/^lib\///')" -- _file_install_path="$CFG_LIBDIR/$_f" -- fi -+ if [ -n "${CFG_REWRITE_PATHS-}" ]; then -+ if echo "$_file" | grep "^lib/" > /dev/null -+ then -+ local _f="$(echo "$_file" | sed 's/^lib\///')" -+ _file_install_path="$CFG_LIBDIR/$_f" -+ fi - -- if echo "$_file" | grep "^share/man/" > /dev/null -- then -- local _f="$(echo "$_file" | sed 's/^share\/man\///')" -- _file_install_path="$CFG_MANDIR/$_f" -+ if echo "$_file" | grep "^share/man/" > /dev/null -+ then -+ local _f="$(echo "$_file" | sed 's/^share\/man\///')" -+ _file_install_path="$CFG_MANDIR/$_f" -+ fi - fi - - # Make sure there's a directory for it -@@ -810,6 +812,7 @@ valopt mandir "$CFG_DESTDIR_PREFIX/share/man" "install man pages in PATH" - opt ldconfig 1 "run ldconfig after installation (Linux only)" - opt verify 1 "obsolete" - flag verbose "run with verbose output" -+opt rewrite-paths 1 "rewrite install paths for libdir & mandir" - - if [ $HELP -eq 1 ] - then --- -2.4.1 - diff --git a/recipes-devtools/rust/rust_1.12.1.bb b/recipes-devtools/rust/rust_1.12.1.bb index d8e7556..f5aa96e 100644 --- a/recipes-devtools/rust/rust_1.12.1.bb +++ b/recipes-devtools/rust/rust_1.12.1.bb @@ -10,10 +10,8 @@ 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}/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 \ file://rust-${PV}/0008-mk-platform.mk-pass-C-crate_hash-to-builds.patch \ - file://rust-installer-${PV}/0001-add-option-to-disable-rewriting-of-install-paths.patch;patchdir=src/rust-installer \ " DEPENDS += "rust-llvm (=${PV})"