diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2016-11-05 15:13:00 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2016-11-05 15:35:49 -0400 |
| commit | 87ea3648133394279aacfd2d2340dfca9c9ed92d (patch) | |
| tree | a745378036d28412202f55e9c999da759aba93b9 | |
| parent | sys-kernel/bliss-initramfs: adding 'type' to metadata.xml due to GLEP 67 (diff) | |
| download | gentoo-87ea3648133394279aacfd2d2340dfca9c9ed92d.tar.gz gentoo-87ea3648133394279aacfd2d2340dfca9c9ed92d.tar.bz2 gentoo-87ea3648133394279aacfd2d2340dfca9c9ed92d.zip | |
sys-fs/udev: fix libudev on non-native abis
Also simplify multilib_src_install; there's no need for variables here.
Package-Manager: portage-2.3.2_p4
| -rw-r--r-- | sys-fs/udev/udev-232-r2.ebuild (renamed from sys-fs/udev/udev-232-r1.ebuild) | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/sys-fs/udev/udev-232-r1.ebuild b/sys-fs/udev/udev-232-r2.ebuild index 83e57cb83e7a..5338a7addf22 100644 --- a/sys-fs/udev/udev-232-r1.ebuild +++ b/sys-fs/udev/udev-232-r2.ebuild @@ -242,9 +242,6 @@ multilib_src_compile() { multilib_src_install() { if multilib_is_native_abi; then - local rootlib_LTLIBRARIES="libudev.la" - local pkgconfiglib_DATA="src/libudev/libudev.pc" - local targets=( install-includeHEADERS install-rootbinPROGRAMS @@ -259,14 +256,10 @@ multilib_src_install() { install-directories-hook install-dist_bashcompletionDATA install-dist_networkDATA - ) - - # add final values of variables: - targets+=( rootlibexec_PROGRAMS=systemd-udevd rootbin_PROGRAMS=udevadm - rootlib_LTLIBRARIES="${rootlib_LTLIBRARIES}" - pkgconfiglib_DATA="${pkgconfiglib_DATA}" + rootlib_LTLIBRARIES="libudev.la" + pkgconfiglib_DATA="src/libudev/libudev.pc" pkgconfigdata_DATA="src/udev/udev.pc" INSTALL_DIRS='$(sysconfdir)/udev/rules.d $(sysconfdir)/udev/hwdb.d $(sysconfdir)/systemd/network' dist_bashcompletion_DATA="shell-completion/bash/udevadm" @@ -280,21 +273,15 @@ multilib_src_install() { dosym ../../$(get_libdir)/libudev.so.1 \ /usr/$(get_libdir)/libudev.so else - local lib_LTLIBRARIES="libudev.la" - local pkgconfiglib_DATA="src/libudev/libudev.pc" - local include_HEADERS="src/libudev/libudev.h" - local targets=( install-libLTLIBRARIES install-includeHEADERS install-pkgconfiglibDATA + lib_LTLIBRARIES="libudev.la" + pkgconfiglib_DATA="src/libudev/libudev.pc" + include_HEADERS="src/libudev/libudev.h" ) - targets+=( - rootlib_LTLIBRARIES="${rootlib_LTLIBRARIES}" - pkgconfiglib_DATA="${pkgconfiglib_DATA}" - include_HEADERS="${include_HEADERS}" - ) emake -j1 DESTDIR="${D}" "${targets[@]}" fi } |