From 3a2f034415d6e9c5c0135136b4e28698f3a15767 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 3 Feb 2018 01:17:00 +0000 Subject: [PATCH] sys-libs/glibc: unbreak installation of non-default ABIs, bug #646424 multilib.eclass has a EMULTILIB_PKG="true" knob to declare package as multilib-compatible. This knob was lost in glibc-2.27 in commit e77866cf2155f9b9a74c015589f3ac95a8edc2be ("sys-libs/glibc: Various cleanups. Work in progress.") Closes: https://bugs.gentoo.org/646424 Package-Manager: Portage-2.3.20, Repoman-2.3.6 --- sys-libs/glibc/{glibc-2.27.ebuild => glibc-2.27-r1.ebuild} | 2 ++ sys-libs/glibc/glibc-9999.ebuild | 2 ++ 2 files changed, 4 insertions(+) rename sys-libs/glibc/{glibc-2.27.ebuild => glibc-2.27-r1.ebuild} (99%) diff --git a/sys-libs/glibc/glibc-2.27.ebuild b/sys-libs/glibc/glibc-2.27-r1.ebuild similarity index 99% rename from sys-libs/glibc/glibc-2.27.ebuild rename to sys-libs/glibc/glibc-2.27-r1.ebuild index ce108bfe60f7..4cb91870ba21 100644 --- a/sys-libs/glibc/glibc-2.27.ebuild +++ b/sys-libs/glibc/glibc-2.27-r1.ebuild @@ -12,6 +12,8 @@ LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE" RESTRICT="strip" # Strip ourself #46186 SLOT="2.2" +EMULTILIB_PKG="true" + if [[ ${PV} == 9999* ]]; then EGIT_REPO_URI="https://sourceware.org/git/glibc.git" inherit git-r3 diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index b172eb766794..3903ddf0d1bd 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -12,6 +12,8 @@ LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE" RESTRICT="strip" # Strip ourself #46186 SLOT="2.2" +EMULTILIB_PKG="true" + if [[ ${PV} == 9999* ]]; then EGIT_REPO_URI="https://sourceware.org/git/glibc.git" inherit git-r3 -- 2.26.2