Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 641036 - cross-*/binutils-9999 installs locale data in /usr/share/locale
Summary: cross-*/binutils-9999 installs locale data in /usr/share/locale
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo Toolchain Maintainers
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2017-12-14 18:56 UTC by Manuel Lauss
Modified: 2018-01-08 22:22 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Manuel Lauss 2017-12-14 18:56:31 UTC
cross-*/binutils-9999 since ~3 weeks install locale data into system location, leading to these install failures, clashing with sys-devel/binutils-9999:

 * Detected file collision(s):
 * 
 *      /usr/share/locale/sk/LC_MESSAGES/binutils.mo
 *      /usr/share/locale/ca/LC_MESSAGES/binutils.mo
 *      /usr/share/locale/zh_TW/LC_MESSAGES/binutils.mo
 *      /usr/share/locale/zh_TW/LC_MESSAGES/ld.mo
 *      /usr/share/locale/vi/LC_MESSAGES/binutils.mo
 *      /usr/share/locale/vi/LC_MESSAGES/opcodes.mo
 *      /usr/share/locale/vi/LC_MESSAGES/bfd.mo
 *      /usr/share/locale/vi/LC_MESSAGES/ld.mo
 *      /usr/share/locale/vi/LC_MESSAGES/gprof.mo
 *      /usr/share/locale/sr/LC_MESSAGES/binutils.mo
 *      /usr/share/locale/sr/LC_MESSAGES/opcodes.mo
 *      /usr/share/locale/sr/LC_MESSAGES/ld.mo
 *      /usr/share/locale/sr/LC_MESSAGES/bfd.mo
 *      /usr/share/locale/sr/LC_MESSAGES/gprof.mo
 *      /usr/share/locale/ro/LC_MESSAGES/binutils.mo
 *      /usr/share/locale/ro/LC_MESSAGES/opcodes.mo
 *      /usr/share/locale/ro/LC_MESSAGES/bfd.mo
 *      /usr/share/locale/ro/LC_MESSAGES/gprof.mo
 *      /usr/share/locale/pt_BR/LC_MESSAGES/opcodes.mo
 *      /usr/share/locale/pt_BR/LC_MESSAGES/ld.mo
 *      /usr/share/locale/pt_BR/LC_MESSAGES/gprof.mo
 *      /usr/share/locale/zh_CN/LC_MESSAGES/binutils.mo

Previously these were installed here:
/usr/share/binutils-data/<cross-tc>/git/locale/
Comment 1 Manuel Lauss 2018-01-08 09:55:45 UTC
Caused by upstream commit ca39c2f4dd0fedcaaee348be7a913f0c14876796
(https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=ca39c2f4dd0fedcaaee348be7a913f0c14876796)

Solution is to apply the following patch to binutils-9999.ebuild:

--- binutils-9999.ebuild~       2017-10-15 15:44:03.000000000 +0200
+++ binutils-9999.ebuild        2018-01-08 10:54:31.187089980 +0100
@@ -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
 
@@ -214,6 +208,7 @@ src_configure() {
                --prefix="${EPREFIX}"/usr
                --host=${CHOST}
                --target=${CTARGET}
+               --datarootdir="${EPREFIX}"${DATAPATH}
                --datadir="${EPREFIX}"${DATAPATH}
                --infodir="${EPREFIX}"${DATAPATH}/info
                --mandir="${EPREFIX}"${DATAPATH}/man
Comment 2 Larry the Git Cow gentoo-dev 2018-01-08 22:22:06 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7fcc77358449f26c195619f3ed0a8b216741d67

commit b7fcc77358449f26c195619f3ed0a8b216741d67
Author:     Sergei Trofimovich <slyfox@gentoo.org>
AuthorDate: 2018-01-08 22:21:53 +0000
Commit:     Sergei Trofimovich <slyfox@gentoo.org>
CommitDate: 2018-01-08 22:22:00 +0000

    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

 sys-devel/binutils/binutils-9999.ebuild | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
Comment 3 Sergei Trofimovich (RETIRED) gentoo-dev 2018-01-08 22:22:38 UTC
(In reply to Manuel Lauss from comment #1)
> Caused by upstream commit ca39c2f4dd0fedcaaee348be7a913f0c14876796
> (https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;
> h=ca39c2f4dd0fedcaaee348be7a913f0c14876796)
> 
> Solution is to apply the following patch to binutils-9999.ebuild:

Great find. Pushed as-is. Thank you!