1 |
commit: 9d00b9ec2e80f52b844b04b02132b32c402b2f88 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 6 07:54:25 2018 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 6 11:43:22 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d00b9ec |
7 |
|
8 |
sys-apps/util-linux: Remove multilib building hacks |
9 |
|
10 |
Remove the hacks that meant to build libraries for non-native ABIs only. |
11 |
This is no longer necessary with the --disable-all-programs configure |
12 |
option. The only difference between the two versions is that without |
13 |
the hacks manpages are also installed which is harmless (and even |
14 |
desirable). |
15 |
|
16 |
sys-apps/util-linux/util-linux-9999.ebuild | 19 +------------------ |
17 |
1 file changed, 1 insertion(+), 18 deletions(-) |
18 |
|
19 |
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild |
20 |
index b36fbd03cc3..eb7548194ff 100644 |
21 |
--- a/sys-apps/util-linux/util-linux-9999.ebuild |
22 |
+++ b/sys-apps/util-linux/util-linux-9999.ebuild |
23 |
@@ -167,29 +167,12 @@ multilib_src_configure() { |
24 |
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
25 |
} |
26 |
|
27 |
-multilib_src_compile() { |
28 |
- if multilib_is_native_abi; then |
29 |
- default |
30 |
- else |
31 |
- # build libraries only |
32 |
- emake -f Makefile -f - mylibs \ |
33 |
- <<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)' |
34 |
- fi |
35 |
-} |
36 |
- |
37 |
multilib_src_test() { |
38 |
multilib_is_native_abi && emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" |
39 |
} |
40 |
|
41 |
multilib_src_install() { |
42 |
- if multilib_is_native_abi; then |
43 |
- default |
44 |
- else |
45 |
- emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \ |
46 |
- install-pkgconfigDATA install-uuidincHEADERS \ |
47 |
- install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \ |
48 |
- install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS |
49 |
- fi |
50 |
+ emake DESTDIR="${D}" install |
51 |
|
52 |
if multilib_is_native_abi; then |
53 |
# need the libs in / |