| 1 |
commit: 61019ed248a31c0a67d4d87e376e4aa889df930e |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 2 07:36:07 2019 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 2 07:37:09 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61019ed2 |
| 7 |
|
| 8 |
sys-apps/util-linux: move gen_usr_ldscript after python install again |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/689116 |
| 11 |
Package-Manager: Portage-2.3.68, Repoman-2.3.16 |
| 12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 13 |
|
| 14 |
.../{util-linux-2.34.ebuild => util-linux-2.34-r1.ebuild} | 8 ++++---- |
| 15 |
sys-apps/util-linux/util-linux-9999.ebuild | 8 ++++---- |
| 16 |
2 files changed, 8 insertions(+), 8 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-apps/util-linux/util-linux-2.34.ebuild b/sys-apps/util-linux/util-linux-2.34-r1.ebuild |
| 19 |
similarity index 100% |
| 20 |
rename from sys-apps/util-linux/util-linux-2.34.ebuild |
| 21 |
rename to sys-apps/util-linux/util-linux-2.34-r1.ebuild |
| 22 |
index efc59ae7357..b15e6ad1a43 100644 |
| 23 |
--- a/sys-apps/util-linux/util-linux-2.34.ebuild |
| 24 |
+++ b/sys-apps/util-linux/util-linux-2.34-r1.ebuild |
| 25 |
@@ -243,14 +243,14 @@ python_install() { |
| 26 |
multilib_src_install() { |
| 27 |
emake DESTDIR="${D}" install |
| 28 |
|
| 29 |
+ if multilib_is_native_abi && use python; then |
| 30 |
+ python_foreach_impl python_install |
| 31 |
+ fi |
| 32 |
+ |
| 33 |
if multilib_is_native_abi && use userland_GNU; then |
| 34 |
# need the libs in / |
| 35 |
gen_usr_ldscript -a blkid fdisk mount smartcols uuid |
| 36 |
fi |
| 37 |
- |
| 38 |
- if multilib_is_native_abi && use python; then |
| 39 |
- python_foreach_impl python_install |
| 40 |
- fi |
| 41 |
} |
| 42 |
|
| 43 |
multilib_src_install_all() { |
| 44 |
|
| 45 |
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild |
| 46 |
index efc59ae7357..b15e6ad1a43 100644 |
| 47 |
--- a/sys-apps/util-linux/util-linux-9999.ebuild |
| 48 |
+++ b/sys-apps/util-linux/util-linux-9999.ebuild |
| 49 |
@@ -243,14 +243,14 @@ python_install() { |
| 50 |
multilib_src_install() { |
| 51 |
emake DESTDIR="${D}" install |
| 52 |
|
| 53 |
+ if multilib_is_native_abi && use python; then |
| 54 |
+ python_foreach_impl python_install |
| 55 |
+ fi |
| 56 |
+ |
| 57 |
if multilib_is_native_abi && use userland_GNU; then |
| 58 |
# need the libs in / |
| 59 |
gen_usr_ldscript -a blkid fdisk mount smartcols uuid |
| 60 |
fi |
| 61 |
- |
| 62 |
- if multilib_is_native_abi && use python; then |
| 63 |
- python_foreach_impl python_install |
| 64 |
- fi |
| 65 |
} |
| 66 |
|
| 67 |
multilib_src_install_all() { |
Archives