From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 912FC1382C5 for ; Sat, 3 Feb 2018 01:18:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 83D54E097B; Sat, 3 Feb 2018 01:18:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5BFA7E097B for ; Sat, 3 Feb 2018 01:18:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BCA2F335C67 for ; Sat, 3 Feb 2018 01:18:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4B7D41CE for ; Sat, 3 Feb 2018 01:18:49 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1517620722.3a2f034415d6e9c5c0135136b4e28698f3a15767.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/glibc/glibc-2.27-r1.ebuild sys-libs/glibc/glibc-2.27.ebuild sys-libs/glibc/glibc-9999.ebuild X-VCS-Directories: sys-libs/glibc/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 3a2f034415d6e9c5c0135136b4e28698f3a15767 X-VCS-Branch: master Date: Sat, 3 Feb 2018 01:18:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ccfbd1f6-0f9f-44f4-b089-a7d5ed86d27e X-Archives-Hash: 61301be4e2cf576428bb666f00ee0ed2 commit: 3a2f034415d6e9c5c0135136b4e28698f3a15767 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Feb 3 01:17:00 2018 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Feb 3 01:18:42 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a2f0344 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(+) 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 ce108bfe60f..4cb91870ba2 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 b172eb76679..3903ddf0d1b 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