diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2018-01-08 22:21:53 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2018-01-08 22:22:00 +0000 |
| commit | b7fcc77358449f26c195619f3ed0a8b216741d67 (patch) | |
| tree | 5a561c088c0715bc3e2e709c22e01f3363ba9703 /sys-devel/binutils | |
| parent | app-portage/smart-live-rebuild: amd64 stable wrt bug #643054 (diff) | |
| download | gentoo-b7fcc77358449f26c195619f3ed0a8b216741d67.tar.gz gentoo-b7fcc77358449f26c195619f3ed0a8b216741d67.tar.bz2 gentoo-b7fcc77358449f26c195619f3ed0a8b216741d67.zip | |
sys-devel/binutils: fix *.mo file collision in live ebuild, bug #641036
Upstream commit ca39c2f4dd0fedcaaee348be7a913f0c14876796
(https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=ca39c2f4dd0fedcaaee348be7a913f0c14876796)
added support for overriding datarootdir without need for sed hack we had.
It broke our hack but we can remove it completely and use
--datarootdir= instead.
Thanks to Manuel Lauss!
Fixed-by: Manuel Lauss
Closes: https://bugs.gentoo.org/641036
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'sys-devel/binutils')
| -rw-r--r-- | sys-devel/binutils/binutils-9999.ebuild | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild index 3c7b8b3b06a1..16b853f51c7e 100644 --- a/sys-devel/binutils/binutils-9999.ebuild +++ b/sys-devel/binutils/binutils-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -124,12 +124,6 @@ src_prepare() { sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c fi - # Fix po Makefile generators - sed -i \ - -e '/^datadir = /s:$(prefix)/@DATADIRNAME@:@datadir@:' \ - -e '/^gnulocaledir = /s:$(prefix)/share:$(datadir):' \ - */po/Make-in || die "sed po's failed" - # Apply things from PATCHES and user dirs default @@ -215,6 +209,7 @@ src_configure() { --host=${CHOST} --target=${CTARGET} --datadir="${EPREFIX}"${DATAPATH} + --datarootdir="${EPREFIX}"${DATAPATH} --infodir="${EPREFIX}"${DATAPATH}/info --mandir="${EPREFIX}"${DATAPATH}/man --bindir="${EPREFIX}"${BINPATH} |