| 1 |
commit: fff54f89818785bb2fa31a463a6242b285bf45a8 |
| 2 |
Author: Tiziano Müller <dev-zero <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 21 14:57:05 2016 +0000 |
| 4 |
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 21 15:01:35 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fff54f89 |
| 7 |
|
| 8 |
sys-fs/multipath-tools: fix systemd version detection (bug #590604) |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
sys-fs/multipath-tools/multipath-tools-0.6.2-r1.ebuild | 12 +++++++++--- |
| 13 |
1 file changed, 9 insertions(+), 3 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-fs/multipath-tools/multipath-tools-0.6.2-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.6.2-r1.ebuild |
| 16 |
index 3ec454b..f5044df 100644 |
| 17 |
--- a/sys-fs/multipath-tools/multipath-tools-0.6.2-r1.ebuild |
| 18 |
+++ b/sys-fs/multipath-tools/multipath-tools-0.6.2-r1.ebuild |
| 19 |
@@ -1,4 +1,4 @@ |
| 20 |
-# Copyright 1999-2014 Gentoo Foundation |
| 21 |
+# Copyright 1999-2016 Gentoo Foundation |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
# $Id$ |
| 24 |
|
| 25 |
@@ -30,10 +30,16 @@ PATCHES=( |
| 26 |
"${FILESDIR}"/${PN}-0.6.2-makefile.patch |
| 27 |
) |
| 28 |
|
| 29 |
+get_systemd_pv() { |
| 30 |
+ use systemd && \ |
| 31 |
+ $(tc-getPKG_CONFIG) --modversion systemd |
| 32 |
+} |
| 33 |
+ |
| 34 |
src_compile() { |
| 35 |
# LIBDM_API_FLUSH involves grepping files in /usr/include, |
| 36 |
# so force the test to go the way we want #411337. |
| 37 |
- emake LIBDM_API_FLUSH=1 CC="$(tc-getCC)" SYSTEMD=$(usex systemd 1 "") |
| 38 |
+ emake \ |
| 39 |
+ LIBDM_API_FLUSH=1 CC="$(tc-getCC)" SYSTEMD="$(get_systemd_pv)" |
| 40 |
} |
| 41 |
|
| 42 |
src_install() { |
| 43 |
@@ -42,7 +48,7 @@ src_install() { |
| 44 |
dodir /sbin /usr/share/man/man{5,8} |
| 45 |
emake \ |
| 46 |
DESTDIR="${D}" \ |
| 47 |
- SYSTEMD=$(usex systemd 1 "") \ |
| 48 |
+ SYSTEMD=$(get_systemd_pv) \ |
| 49 |
unitdir="$(systemd_get_systemunitdir)" \ |
| 50 |
libudevdir='${prefix}'/"${udevdir}" \ |
| 51 |
install |
Archives