summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirkjan Ochtman <djc@gentoo.org>2016-07-08 12:27:35 +0200
committerDirkjan Ochtman <djc@gentoo.org>2016-07-08 14:16:57 +0200
commit5fa2cd9fe78dbaecf44e6dc74214c9548068e5ff (patch)
tree404d4bb3eab6899e3949cfb4e0cd04f03eb0890a /dev-util/cargo/files
parentdev-libs/openssl: ia64 stable wrt bug #585276 (diff)
downloadgentoo-5fa2cd9fe78dbaecf44e6dc74214c9548068e5ff.tar.gz
gentoo-5fa2cd9fe78dbaecf44e6dc74214c9548068e5ff.tar.bz2
gentoo-5fa2cd9fe78dbaecf44e6dc74214c9548068e5ff.zip
dev-util/cargo: version bump to 0.11.0
Package-Manager: portage-2.2.28
Diffstat (limited to 'dev-util/cargo/files')
-rw-r--r--dev-util/cargo/files/0.11.0-0003-build-respect-datadir-infodir-mandir-libdir-and-sysc.patch51
1 files changed, 51 insertions, 0 deletions
diff --git a/dev-util/cargo/files/0.11.0-0003-build-respect-datadir-infodir-mandir-libdir-and-sysc.patch b/dev-util/cargo/files/0.11.0-0003-build-respect-datadir-infodir-mandir-libdir-and-sysc.patch
new file mode 100644
index 000000000000..16abedff65b2
--- /dev/null
+++ b/dev-util/cargo/files/0.11.0-0003-build-respect-datadir-infodir-mandir-libdir-and-sysc.patch
@@ -0,0 +1,51 @@
+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
+