From 61019ed248a31c0a67d4d87e376e4aa889df930e Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Tue, 2 Jul 2019 09:36:07 +0200 Subject: [PATCH] sys-apps/util-linux: move gen_usr_ldscript after python install again Closes: https://bugs.gentoo.org/689116 Package-Manager: Portage-2.3.68, Repoman-2.3.16 Signed-off-by: Lars Wendler --- .../{util-linux-2.34.ebuild => util-linux-2.34-r1.ebuild} | 8 ++++---- sys-apps/util-linux/util-linux-9999.ebuild | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) rename sys-apps/util-linux/{util-linux-2.34.ebuild => util-linux-2.34-r1.ebuild} (100%) diff --git a/sys-apps/util-linux/util-linux-2.34.ebuild b/sys-apps/util-linux/util-linux-2.34-r1.ebuild similarity index 100% rename from sys-apps/util-linux/util-linux-2.34.ebuild rename to sys-apps/util-linux/util-linux-2.34-r1.ebuild index efc59ae73575..b15e6ad1a438 100644 --- a/sys-apps/util-linux/util-linux-2.34.ebuild +++ b/sys-apps/util-linux/util-linux-2.34-r1.ebuild @@ -243,14 +243,14 @@ python_install() { multilib_src_install() { emake DESTDIR="${D}" install + if multilib_is_native_abi && use python; then + python_foreach_impl python_install + fi + if multilib_is_native_abi && use userland_GNU; then # need the libs in / gen_usr_ldscript -a blkid fdisk mount smartcols uuid fi - - if multilib_is_native_abi && use python; then - python_foreach_impl python_install - fi } multilib_src_install_all() { diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index efc59ae73575..b15e6ad1a438 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -243,14 +243,14 @@ python_install() { multilib_src_install() { emake DESTDIR="${D}" install + if multilib_is_native_abi && use python; then + python_foreach_impl python_install + fi + if multilib_is_native_abi && use userland_GNU; then # need the libs in / gen_usr_ldscript -a blkid fdisk mount smartcols uuid fi - - if multilib_is_native_abi && use python; then - python_foreach_impl python_install - fi } multilib_src_install_all() { -- 2.26.2