summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/cargo/files/0001-build-strip-CFG_PREFIX-from-CFG_-DATADIR-MANDIR-INFO.patch')
-rw-r--r--dev-util/cargo/files/0001-build-strip-CFG_PREFIX-from-CFG_-DATADIR-MANDIR-INFO.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/dev-util/cargo/files/0001-build-strip-CFG_PREFIX-from-CFG_-DATADIR-MANDIR-INFO.patch b/dev-util/cargo/files/0001-build-strip-CFG_PREFIX-from-CFG_-DATADIR-MANDIR-INFO.patch
deleted file mode 100644
index 26b7d1418baa..000000000000
--- a/dev-util/cargo/files/0001-build-strip-CFG_PREFIX-from-CFG_-DATADIR-MANDIR-INFO.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 7afdd06f631763cc91699b77d5e03fc2d1ed97ee Mon Sep 17 00:00:00 2001
-From: Doug Goldstein <cardoe@cardoe.com>
-Date: Tue, 28 Jun 2016 16:27:25 -0500
-Subject: [PATCH 1/4] build: strip CFG_PREFIX from
- CFG_{DATADIR,MANDIR,INFODIR,LIBDIR}
-
-While these variables are not yet used by the Makefile, to be used
-CFG_PREFIX must be stripped from them. The 'make install' rule creates
-a tarball and then the install.sh script extracts it relative to the
-prefix argument --prefix, which in the case of a Cargo install is
-relative to CFG_PREFIX. This is why CFG_PREFIX needs to be stripped out
-of CFG_DATADIR, CFG_MANDIR, CFG_INFODIR, and CFG_LIBDIR.
-
-Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
----
- configure | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/configure b/configure
-index d8dc591..91b4f7d 100755
---- a/configure
-+++ b/configure
-@@ -357,6 +357,13 @@ CFG_MANDIR=${CFG_MANDIR%/}
- CFG_HOST="$(echo $CFG_HOST | tr ',' ' ')"
- CFG_TARGET="$(echo $CFG_TARGET | tr ',' ' ')"
-
-+# strip CFG_PREFIX from variables used for installation so that
-+# install.sh's --prefix value can be used instead
-+CFG_DATADIR=${CFG_DATADIR#${CFG_PREFIX}}
-+CFG_INFODIR=${CFG_INFODIR#${CFG_PREFIX}}
-+CFG_MANDIR=${CFG_MANDIR#${CFG_PREFIX}}
-+CFG_LIBDIR=${CFG_LIBDIR#${CFG_PREFIX}}
-+
- # copy host-triples to target-triples so that hosts are a subset of targets
- V_TEMP=""
- for i in $CFG_HOST $CFG_TARGET;
---
-2.7.3
-