mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-05 12:38:09 -07:00
dev-util/cargo: remove unused patches
This commit is contained in:
Michael Mair-Keimberger (asterix)
committed by
Dirkjan Ochtman
Dirkjan Ochtman
parent
6af056f022
commit
9cd33c507a
@@ -1,51 +0,0 @@
|
||||
From 0d6304b5922b712694fa82979cdf1ed85bc9c778 Mon Sep 17 00:00:00 2001
|
||||
From: Doug Goldstein <cardoe@cardoe.com>
|
||||
Date: Mon, 27 Jun 2016 08:46:36 -0500
|
||||
Subject: [PATCH 3/4] build: respect datadir, infodir, mandir, libdir, and
|
||||
sysconfdir
|
||||
|
||||
The configure script exposes datadir, infodir, mandir, libdir, and
|
||||
sysconfdir but then they are unused so distros or users with
|
||||
non-standard paths are not able to change things as would be expected by
|
||||
the configure script.
|
||||
|
||||
Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
|
||||
---
|
||||
Makefile.in | 18 +++++++++---------
|
||||
1 file changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index fadcb4b..2503cd5 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -271,18 +271,18 @@ prepare-image-$(1):
|
||||
@[ -f $$(TARGET_$(1))/cargo$$(X) ] || echo 'Please run `make` first'
|
||||
@[ -f $$(TARGET_$(1))/cargo$$(X) ]
|
||||
rm -rf $$(IMGDIR_$(1))
|
||||
- mkdir -p $$(IMGDIR_$(1))/bin $$(IMGDIR_$(1))/lib/cargo \
|
||||
- $$(IMGDIR_$(1))/share/man/man1 \
|
||||
- $$(IMGDIR_$(1))/share/doc/cargo \
|
||||
- $$(IMGDIR_$(1))/share/zsh/site-functions \
|
||||
- $$(IMGDIR_$(1))/etc/bash_completion.d
|
||||
+ mkdir -p $$(IMGDIR_$(1))/bin $$(IMGDIR_$(1))/$(CFG_LIBDIR)/cargo \
|
||||
+ $$(IMGDIR_$(1))$(CFG_MANDIR)/man1 \
|
||||
+ $$(IMGDIR_$(1))$(CFG_DATADIR)/doc/cargo \
|
||||
+ $$(IMGDIR_$(1))$(CFG_DATADIR)/zsh/site-functions \
|
||||
+ $$(IMGDIR_$(1))$(CFG_SYSCONFDIR)/bash_completion.d
|
||||
cp $$(TARGET_$(1))/cargo$$(X) $$(IMGDIR_$(1))/bin
|
||||
- cp $(S)src/etc/man/*.1 $$(IMGDIR_$(1))/share/man/man1
|
||||
- cp $(S)src/etc/_cargo $$(IMGDIR_$(1))/share/zsh/site-functions/_cargo
|
||||
- cp $(S)src/etc/cargo.bashcomp.sh $$(IMGDIR_$(1))/etc/bash_completion.d/cargo
|
||||
+ cp $(S)src/etc/man/*.1 $$(IMGDIR_$(1))$(CFG_MANDIR)/man1
|
||||
+ cp $(S)src/etc/_cargo $$(IMGDIR_$(1))$(CFG_DATADIR)/zsh/site-functions/_cargo
|
||||
+ cp $(S)src/etc/cargo.bashcomp.sh $$(IMGDIR_$(1))$(CFG_SYSCONFDIR)/bash_completion.d/cargo
|
||||
cp $(S)README.md $(S)LICENSE-MIT $(S)LICENSE-APACHE \
|
||||
$(S)LICENSE-THIRD-PARTY \
|
||||
- $$(IMGDIR_$(1))/share/doc/cargo
|
||||
+ $$(IMGDIR_$(1))$(CFG_DATADIR)/doc/cargo
|
||||
|
||||
prepare-overlay-$(1):
|
||||
rm -Rf $$(OVERLAYDIR_$(1))
|
||||
--
|
||||
2.7.3
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
From 555414c1da9acc1b59a08a316d0d4b5f87514025 Mon Sep 17 00:00:00 2001
|
||||
From: Doug Goldstein <cardoe@cardoe.com>
|
||||
Date: Tue, 28 Jun 2016 16:59:32 -0500
|
||||
Subject: [PATCH 2/4] build: write updated variables to config.mk
|
||||
|
||||
Write the CFG_PREFIX stripped CFG_DATADIR, CFG_MANDIR, and CFG_INFODIR
|
||||
to config.mk
|
||||
|
||||
Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
|
||||
---
|
||||
configure | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 91b4f7d..0b23dcd 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -353,7 +353,10 @@ fi
|
||||
|
||||
# a little post-processing of various config values
|
||||
CFG_PREFIX=${CFG_PREFIX%/}
|
||||
+CFG_DATADIR=${CFG_DATADIR%/}
|
||||
+CFG_INFODIR=${CFG_INFODIR%/}
|
||||
CFG_MANDIR=${CFG_MANDIR%/}
|
||||
+CFG_LIBDIR=${CFG_LIBDIR%/}
|
||||
CFG_HOST="$(echo $CFG_HOST | tr ',' ' ')"
|
||||
CFG_TARGET="$(echo $CFG_TARGET | tr ',' ' ')"
|
||||
|
||||
@@ -406,8 +409,10 @@ putvar CFG_PREFIX
|
||||
putvar CFG_BUILD
|
||||
putvar CFG_HOST
|
||||
putvar CFG_TARGET
|
||||
-putvar CFG_LIBDIR
|
||||
+putvar CFG_DATADIR
|
||||
+putvar CFG_INFODIR
|
||||
putvar CFG_MANDIR
|
||||
+putvar CFG_LIBDIR
|
||||
putvar CFG_RUSTC
|
||||
putvar CFG_RUSTDOC
|
||||
|
||||
--
|
||||
2.7.3
|
||||
|
||||
@@ -1,51 +0,0 @@
|
||||
From 0d6304b5922b712694fa82979cdf1ed85bc9c778 Mon Sep 17 00:00:00 2001
|
||||
From: Doug Goldstein <cardoe@cardoe.com>
|
||||
Date: Mon, 27 Jun 2016 08:46:36 -0500
|
||||
Subject: [PATCH 3/4] build: respect datadir, infodir, mandir, libdir, and
|
||||
sysconfdir
|
||||
|
||||
The configure script exposes datadir, infodir, mandir, libdir, and
|
||||
sysconfdir but then they are unused so distros or users with
|
||||
non-standard paths are not able to change things as would be expected by
|
||||
the configure script.
|
||||
|
||||
Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
|
||||
---
|
||||
Makefile.in | 18 +++++++++---------
|
||||
1 file changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index fadcb4b..2503cd5 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -271,18 +271,18 @@ prepare-image-$(1):
|
||||
@[ -f $$(TARGET_$(1))/cargo$$(X) ] || echo 'Please run `make` first'
|
||||
@[ -f $$(TARGET_$(1))/cargo$$(X) ]
|
||||
rm -rf $$(IMGDIR_$(1))
|
||||
- mkdir -p $$(IMGDIR_$(1))/bin $$(IMGDIR_$(1))/lib/cargo \
|
||||
- $$(IMGDIR_$(1))/share/man/man1 \
|
||||
- $$(IMGDIR_$(1))/share/doc/cargo \
|
||||
- $$(IMGDIR_$(1))/share/zsh/site-functions \
|
||||
- $$(IMGDIR_$(1))/etc/bash_completion.d
|
||||
+ mkdir -p $$(IMGDIR_$(1))/bin $$(IMGDIR_$(1))/$(CFG_LIBDIR)/cargo \
|
||||
+ $$(IMGDIR_$(1))$(CFG_MANDIR)/man1 \
|
||||
+ $$(IMGDIR_$(1))$(CFG_DATADIR)/doc/cargo \
|
||||
+ $$(IMGDIR_$(1))$(CFG_DATADIR)/zsh/site-functions \
|
||||
+ $$(IMGDIR_$(1))$(CFG_SYSCONFDIR)/bash_completion.d
|
||||
cp $$(TARGET_$(1))/cargo$$(X) $$(IMGDIR_$(1))/bin
|
||||
- cp $(S)src/etc/cargo.1 $$(IMGDIR_$(1))/share/man/man1
|
||||
- cp $(S)src/etc/_cargo $$(IMGDIR_$(1))/share/zsh/site-functions/_cargo
|
||||
- cp $(S)src/etc/cargo.bashcomp.sh $$(IMGDIR_$(1))/etc/bash_completion.d/cargo
|
||||
+ cp $(S)src/etc/cargo.1 $$(IMGDIR_$(1))$(CFG_MANDIR)/man1
|
||||
+ cp $(S)src/etc/_cargo $$(IMGDIR_$(1))$(CFG_DATADIR)/zsh/site-functions/_cargo
|
||||
+ cp $(S)src/etc/cargo.bashcomp.sh $$(IMGDIR_$(1))$(CFG_SYSCONFDIR)/bash_completion.d/cargo
|
||||
cp $(S)README.md $(S)LICENSE-MIT $(S)LICENSE-APACHE \
|
||||
$(S)LICENSE-THIRD-PARTY \
|
||||
- $$(IMGDIR_$(1))/share/doc/cargo
|
||||
+ $$(IMGDIR_$(1))$(CFG_DATADIR)/doc/cargo
|
||||
|
||||
prepare-overlay-$(1):
|
||||
rm -Rf $$(OVERLAYDIR_$(1))
|
||||
--
|
||||
2.7.3
|
||||
|
||||
@@ -1,75 +0,0 @@
|
||||
From 4c3450ebebfe677e35ed11109ee4f4208f68c86b Mon Sep 17 00:00:00 2001
|
||||
From: Doug Goldstein <cardoe@cardoe.com>
|
||||
Date: Mon, 27 Jun 2016 08:56:26 -0500
|
||||
Subject: [PATCH 4/4] build: add docdir to configure
|
||||
|
||||
Add a docdir argument to the configure script to allow distros or users
|
||||
with non-standard paths to customize the installation as needed.
|
||||
|
||||
Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
|
||||
---
|
||||
Makefile.in | 4 ++--
|
||||
configure | 4 ++++
|
||||
2 files changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 2503cd5..a0e20c2 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -273,7 +273,7 @@ prepare-image-$(1):
|
||||
rm -rf $$(IMGDIR_$(1))
|
||||
mkdir -p $$(IMGDIR_$(1))/bin $$(IMGDIR_$(1))/$(CFG_LIBDIR)/cargo \
|
||||
$$(IMGDIR_$(1))$(CFG_MANDIR)/man1 \
|
||||
- $$(IMGDIR_$(1))$(CFG_DATADIR)/doc/cargo \
|
||||
+ $$(IMGDIR_$(1))$(CFG_DOCDIR) \
|
||||
$$(IMGDIR_$(1))$(CFG_DATADIR)/zsh/site-functions \
|
||||
$$(IMGDIR_$(1))$(CFG_SYSCONFDIR)/bash_completion.d
|
||||
cp $$(TARGET_$(1))/cargo$$(X) $$(IMGDIR_$(1))/bin
|
||||
@@ -282,7 +282,7 @@ prepare-image-$(1):
|
||||
cp $(S)src/etc/cargo.bashcomp.sh $$(IMGDIR_$(1))$(CFG_SYSCONFDIR)/bash_completion.d/cargo
|
||||
cp $(S)README.md $(S)LICENSE-MIT $(S)LICENSE-APACHE \
|
||||
$(S)LICENSE-THIRD-PARTY \
|
||||
- $$(IMGDIR_$(1))$(CFG_DATADIR)/doc/cargo
|
||||
+ $$(IMGDIR_$(1))$(CFG_DOCDIR)
|
||||
|
||||
prepare-overlay-$(1):
|
||||
rm -Rf $$(OVERLAYDIR_$(1))
|
||||
diff --git a/configure b/configure
|
||||
index 0b23dcd..1634dd3 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -325,6 +325,7 @@ valopt localstatedir "/var/lib" "local state directory"
|
||||
valopt sysconfdir "/etc" "install system configuration files"
|
||||
valopt datadir "${CFG_PREFIX}/share" "install data"
|
||||
valopt infodir "${CFG_PREFIX}/share/info" "install additional info"
|
||||
+valopt docdir "${CFG_PREFIX}/share/doc/cargo" "install extra docs"
|
||||
valopt mandir "${CFG_PREFIX}/share/man" "install man pages in PATH"
|
||||
valopt libdir "${CFG_PREFIX}/lib" "install libraries"
|
||||
valopt local-cargo "" "local cargo to bootstrap from"
|
||||
@@ -355,6 +356,7 @@ fi
|
||||
CFG_PREFIX=${CFG_PREFIX%/}
|
||||
CFG_DATADIR=${CFG_DATADIR%/}
|
||||
CFG_INFODIR=${CFG_INFODIR%/}
|
||||
+CFG_DOCDIR=${CFG_DOCDIR%/}
|
||||
CFG_MANDIR=${CFG_MANDIR%/}
|
||||
CFG_LIBDIR=${CFG_LIBDIR%/}
|
||||
CFG_HOST="$(echo $CFG_HOST | tr ',' ' ')"
|
||||
@@ -364,6 +366,7 @@ CFG_TARGET="$(echo $CFG_TARGET | tr ',' ' ')"
|
||||
# install.sh's --prefix value can be used instead
|
||||
CFG_DATADIR=${CFG_DATADIR#${CFG_PREFIX}}
|
||||
CFG_INFODIR=${CFG_INFODIR#${CFG_PREFIX}}
|
||||
+CFG_DOCDIR=${CFG_DOCDIR#${CFG_PREFIX}}
|
||||
CFG_MANDIR=${CFG_MANDIR#${CFG_PREFIX}}
|
||||
CFG_LIBDIR=${CFG_LIBDIR#${CFG_PREFIX}}
|
||||
|
||||
@@ -410,6 +413,7 @@ putvar CFG_BUILD
|
||||
putvar CFG_HOST
|
||||
putvar CFG_TARGET
|
||||
putvar CFG_DATADIR
|
||||
+putvar CFG_DOCDIR
|
||||
putvar CFG_INFODIR
|
||||
putvar CFG_MANDIR
|
||||
putvar CFG_LIBDIR
|
||||
--
|
||||
2.7.3
|
||||
|
||||
Reference in New Issue
Block a user