diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2018-04-06 09:54:25 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2018-04-06 13:43:22 +0200 |
| commit | 9d00b9ec2e80f52b844b04b02132b32c402b2f88 (patch) | |
| tree | 0028557987eb5726202f09f237fed3f0e3658d77 | |
| parent | sys-apps/util-linux: Explicitly disable all programs for non-native (diff) | |
| download | gentoo-9d00b9ec2e80f52b844b04b02132b32c402b2f88.tar.gz gentoo-9d00b9ec2e80f52b844b04b02132b32c402b2f88.tar.bz2 gentoo-9d00b9ec2e80f52b844b04b02132b32c402b2f88.zip | |
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).
| -rw-r--r-- | sys-apps/util-linux/util-linux-9999.ebuild | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index b36fbd03cc32..eb7548194ffa 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 / |