mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 17:09:10 -07:00
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
This commit is contained in:
@@ -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}
|
||||
|
||||
Reference in New Issue
Block a user