Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/
Date: Sat, 03 Feb 2018 01:18:53
Message-Id: 1517620722.3a2f034415d6e9c5c0135136b4e28698f3a15767.slyfox@gentoo
1 commit: 3a2f034415d6e9c5c0135136b4e28698f3a15767
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 3 01:17:00 2018 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 3 01:18:42 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a2f0344
7
8 sys-libs/glibc: unbreak installation of non-default ABIs, bug #646424
9
10 multilib.eclass has a EMULTILIB_PKG="true" knob to declare package
11 as multilib-compatible. This knob was lost in glibc-2.27 in commit
12 e77866cf2155f9b9a74c015589f3ac95a8edc2be
13 ("sys-libs/glibc: Various cleanups. Work in progress.")
14
15 Closes: https://bugs.gentoo.org/646424
16 Package-Manager: Portage-2.3.20, Repoman-2.3.6
17
18 sys-libs/glibc/{glibc-2.27.ebuild => glibc-2.27-r1.ebuild} | 2 ++
19 sys-libs/glibc/glibc-9999.ebuild | 2 ++
20 2 files changed, 4 insertions(+)
21
22 diff --git a/sys-libs/glibc/glibc-2.27.ebuild b/sys-libs/glibc/glibc-2.27-r1.ebuild
23 similarity index 99%
24 rename from sys-libs/glibc/glibc-2.27.ebuild
25 rename to sys-libs/glibc/glibc-2.27-r1.ebuild
26 index ce108bfe60f..4cb91870ba2 100644
27 --- a/sys-libs/glibc/glibc-2.27.ebuild
28 +++ b/sys-libs/glibc/glibc-2.27-r1.ebuild
29 @@ -12,6 +12,8 @@ LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
30 RESTRICT="strip" # Strip ourself #46186
31 SLOT="2.2"
32
33 +EMULTILIB_PKG="true"
34 +
35 if [[ ${PV} == 9999* ]]; then
36 EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
37 inherit git-r3
38
39 diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
40 index b172eb76679..3903ddf0d1b 100644
41 --- a/sys-libs/glibc/glibc-9999.ebuild
42 +++ b/sys-libs/glibc/glibc-9999.ebuild
43 @@ -12,6 +12,8 @@ LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
44 RESTRICT="strip" # Strip ourself #46186
45 SLOT="2.2"
46
47 +EMULTILIB_PKG="true"
48 +
49 if [[ ${PV} == 9999* ]]; then
50 EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
51 inherit git-r3