| 1 |
commit: b7fcc77358449f26c195619f3ed0a8b216741d67 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 8 22:21:53 2018 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 8 22:22:00 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7fcc773 |
| 7 |
|
| 8 |
sys-devel/binutils: fix *.mo file collision in live ebuild, bug #641036 |
| 9 |
|
| 10 |
Upstream commit ca39c2f4dd0fedcaaee348be7a913f0c14876796 |
| 11 |
(https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=ca39c2f4dd0fedcaaee348be7a913f0c14876796) |
| 12 |
added support for overriding datarootdir without need for sed hack we had. |
| 13 |
|
| 14 |
It broke our hack but we can remove it completely and use |
| 15 |
--datarootdir= instead. |
| 16 |
|
| 17 |
Thanks to Manuel Lauss! |
| 18 |
|
| 19 |
Fixed-by: Manuel Lauss |
| 20 |
Closes: https://bugs.gentoo.org/641036 |
| 21 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 22 |
|
| 23 |
sys-devel/binutils/binutils-9999.ebuild | 9 ++------- |
| 24 |
1 file changed, 2 insertions(+), 7 deletions(-) |
| 25 |
|
| 26 |
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild |
| 27 |
index 3c7b8b3b06a..16b853f51c7 100644 |
| 28 |
--- a/sys-devel/binutils/binutils-9999.ebuild |
| 29 |
+++ b/sys-devel/binutils/binutils-9999.ebuild |
| 30 |
@@ -1,4 +1,4 @@ |
| 31 |
-# Copyright 1999-2017 Gentoo Foundation |
| 32 |
+# Copyright 1999-2018 Gentoo Foundation |
| 33 |
# Distributed under the terms of the GNU General Public License v2 |
| 34 |
|
| 35 |
EAPI=6 |
| 36 |
@@ -124,12 +124,6 @@ src_prepare() { |
| 37 |
sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c |
| 38 |
fi |
| 39 |
|
| 40 |
- # Fix po Makefile generators |
| 41 |
- sed -i \ |
| 42 |
- -e '/^datadir = /s:$(prefix)/@DATADIRNAME@:@datadir@:' \ |
| 43 |
- -e '/^gnulocaledir = /s:$(prefix)/share:$(datadir):' \ |
| 44 |
- */po/Make-in || die "sed po's failed" |
| 45 |
- |
| 46 |
# Apply things from PATCHES and user dirs |
| 47 |
default |
| 48 |
|
| 49 |
@@ -215,6 +209,7 @@ src_configure() { |
| 50 |
--host=${CHOST} |
| 51 |
--target=${CTARGET} |
| 52 |
--datadir="${EPREFIX}"${DATAPATH} |
| 53 |
+ --datarootdir="${EPREFIX}"${DATAPATH} |
| 54 |
--infodir="${EPREFIX}"${DATAPATH}/info |
| 55 |
--mandir="${EPREFIX}"${DATAPATH}/man |
| 56 |
--bindir="${EPREFIX}"${BINPATH} |
Archives