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 0C8551382C5 for ; Fri, 6 Apr 2018 11:44:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42771E08D3; Fri, 6 Apr 2018 11:44:21 +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 1D8C6E08D3 for ; Fri, 6 Apr 2018 11:44:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 B7430335C0A for ; Fri, 6 Apr 2018 11:44:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4094F27A for ; Fri, 6 Apr 2018 11:44:17 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1523015002.9d00b9ec2e80f52b844b04b02132b32c402b2f88.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/util-linux/util-linux-9999.ebuild X-VCS-Directories: sys-apps/util-linux/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 9d00b9ec2e80f52b844b04b02132b32c402b2f88 X-VCS-Branch: master Date: Fri, 6 Apr 2018 11:44:17 +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: 8f56a97a-31a3-43f7-b642-9940166588f5 X-Archives-Hash: c5ec9b07a036a987665dc978bc5935ea commit: 9d00b9ec2e80f52b844b04b02132b32c402b2f88 Author: Michał Górny gentoo org> AuthorDate: Fri Apr 6 07:54:25 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Apr 6 11:43:22 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d00b9ec sys-apps/util-linux: Remove multilib building hacks Remove the hacks that meant to build libraries for non-native ABIs only. This is no longer necessary with the --disable-all-programs configure option. The only difference between the two versions is that without the hacks manpages are also installed which is harmless (and even desirable). sys-apps/util-linux/util-linux-9999.ebuild | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index b36fbd03cc3..eb7548194ff 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -167,29 +167,12 @@ multilib_src_configure() { ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } -multilib_src_compile() { - if multilib_is_native_abi; then - default - else - # build libraries only - emake -f Makefile -f - mylibs \ - <<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)' - fi -} - multilib_src_test() { multilib_is_native_abi && emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" } multilib_src_install() { - if multilib_is_native_abi; then - default - else - emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \ - install-pkgconfigDATA install-uuidincHEADERS \ - install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \ - install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS - fi + emake DESTDIR="${D}" install if multilib_is_native_abi; then # need the libs in /