| 1 |
commit: 87ea3648133394279aacfd2d2340dfca9c9ed92d |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 5 19:13:00 2016 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 5 19:35:49 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87ea3648 |
| 7 |
|
| 8 |
sys-fs/udev: fix libudev on non-native abis |
| 9 |
|
| 10 |
Also simplify multilib_src_install; there's no need for variables here. |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.2_p4 |
| 13 |
|
| 14 |
.../{udev-232-r1.ebuild => udev-232-r2.ebuild} | 23 +++++----------------- |
| 15 |
1 file changed, 5 insertions(+), 18 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-fs/udev/udev-232-r1.ebuild b/sys-fs/udev/udev-232-r2.ebuild |
| 18 |
similarity index 96% |
| 19 |
rename from sys-fs/udev/udev-232-r1.ebuild |
| 20 |
rename to sys-fs/udev/udev-232-r2.ebuild |
| 21 |
index 83e57cb..5338a7a 100644 |
| 22 |
--- a/sys-fs/udev/udev-232-r1.ebuild |
| 23 |
+++ b/sys-fs/udev/udev-232-r2.ebuild |
| 24 |
@@ -242,9 +242,6 @@ multilib_src_compile() { |
| 25 |
|
| 26 |
multilib_src_install() { |
| 27 |
if multilib_is_native_abi; then |
| 28 |
- local rootlib_LTLIBRARIES="libudev.la" |
| 29 |
- local pkgconfiglib_DATA="src/libudev/libudev.pc" |
| 30 |
- |
| 31 |
local targets=( |
| 32 |
install-includeHEADERS |
| 33 |
install-rootbinPROGRAMS |
| 34 |
@@ -259,14 +256,10 @@ multilib_src_install() { |
| 35 |
install-directories-hook |
| 36 |
install-dist_bashcompletionDATA |
| 37 |
install-dist_networkDATA |
| 38 |
- ) |
| 39 |
- |
| 40 |
- # add final values of variables: |
| 41 |
- targets+=( |
| 42 |
rootlibexec_PROGRAMS=systemd-udevd |
| 43 |
rootbin_PROGRAMS=udevadm |
| 44 |
- rootlib_LTLIBRARIES="${rootlib_LTLIBRARIES}" |
| 45 |
- pkgconfiglib_DATA="${pkgconfiglib_DATA}" |
| 46 |
+ rootlib_LTLIBRARIES="libudev.la" |
| 47 |
+ pkgconfiglib_DATA="src/libudev/libudev.pc" |
| 48 |
pkgconfigdata_DATA="src/udev/udev.pc" |
| 49 |
INSTALL_DIRS='$(sysconfdir)/udev/rules.d $(sysconfdir)/udev/hwdb.d $(sysconfdir)/systemd/network' |
| 50 |
dist_bashcompletion_DATA="shell-completion/bash/udevadm" |
| 51 |
@@ -280,21 +273,15 @@ multilib_src_install() { |
| 52 |
dosym ../../$(get_libdir)/libudev.so.1 \ |
| 53 |
/usr/$(get_libdir)/libudev.so |
| 54 |
else |
| 55 |
- local lib_LTLIBRARIES="libudev.la" |
| 56 |
- local pkgconfiglib_DATA="src/libudev/libudev.pc" |
| 57 |
- local include_HEADERS="src/libudev/libudev.h" |
| 58 |
- |
| 59 |
local targets=( |
| 60 |
install-libLTLIBRARIES |
| 61 |
install-includeHEADERS |
| 62 |
install-pkgconfiglibDATA |
| 63 |
+ lib_LTLIBRARIES="libudev.la" |
| 64 |
+ pkgconfiglib_DATA="src/libudev/libudev.pc" |
| 65 |
+ include_HEADERS="src/libudev/libudev.h" |
| 66 |
) |
| 67 |
|
| 68 |
- targets+=( |
| 69 |
- rootlib_LTLIBRARIES="${rootlib_LTLIBRARIES}" |
| 70 |
- pkgconfiglib_DATA="${pkgconfiglib_DATA}" |
| 71 |
- include_HEADERS="${include_HEADERS}" |
| 72 |
- ) |
| 73 |
emake -j1 DESTDIR="${D}" "${targets[@]}" |
| 74 |
fi |
| 75 |
} |
Archives