sys-apps/util-linux: Remove multilib building hacks
authorMichał Górny <mgorny@gentoo.org>
Fri, 6 Apr 2018 07:54:25 +0000 (09:54 +0200)
committerMichał Górny <mgorny@gentoo.org>
Fri, 6 Apr 2018 11:43:22 +0000 (13:43 +0200)
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

index b36fbd03cc3238838f8decb47381ea0468b934c6..eb7548194ffab4661f7931acd279c92681185f6d 100644 (file)
@@ -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 /