From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B069513832E for ; Sun, 21 Aug 2016 15:03:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC23321C012; Sun, 21 Aug 2016 15:03:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7E2CA21C012 for ; Sun, 21 Aug 2016 15:03:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 789BE33FD24 for ; Sun, 21 Aug 2016 15:03:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D23512456 for ; Sun, 21 Aug 2016 15:03:02 +0000 (UTC) From: "Tiziano Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tiziano Müller" Message-ID: <1471791695.fff54f89818785bb2fa31a463a6242b285bf45a8.dev-zero@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/multipath-tools/multipath-tools-0.6.2-r1.ebuild X-VCS-Directories: sys-fs/multipath-tools/ X-VCS-Committer: dev-zero X-VCS-Committer-Name: Tiziano Müller X-VCS-Revision: fff54f89818785bb2fa31a463a6242b285bf45a8 X-VCS-Branch: master Date: Sun, 21 Aug 2016 15:03:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 017aa465-dcbd-4f23-b73e-808dc7a46e5e X-Archives-Hash: 33d5d24c89d3ff204913dcb52276423d commit: fff54f89818785bb2fa31a463a6242b285bf45a8 Author: Tiziano Müller gentoo org> AuthorDate: Sun Aug 21 14:57:05 2016 +0000 Commit: Tiziano Müller gentoo org> CommitDate: Sun Aug 21 15:01:35 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fff54f89 sys-fs/multipath-tools: fix systemd version detection (bug #590604) Package-Manager: portage-2.3.0 sys-fs/multipath-tools/multipath-tools-0.6.2-r1.ebuild | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) 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 index 3ec454b..f5044df 100644 --- a/sys-fs/multipath-tools/multipath-tools-0.6.2-r1.ebuild +++ b/sys-fs/multipath-tools/multipath-tools-0.6.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -30,10 +30,16 @@ PATCHES=( "${FILESDIR}"/${PN}-0.6.2-makefile.patch ) +get_systemd_pv() { + use systemd && \ + $(tc-getPKG_CONFIG) --modversion systemd +} + src_compile() { # LIBDM_API_FLUSH involves grepping files in /usr/include, # so force the test to go the way we want #411337. - emake LIBDM_API_FLUSH=1 CC="$(tc-getCC)" SYSTEMD=$(usex systemd 1 "") + emake \ + LIBDM_API_FLUSH=1 CC="$(tc-getCC)" SYSTEMD="$(get_systemd_pv)" } src_install() { @@ -42,7 +48,7 @@ src_install() { dodir /sbin /usr/share/man/man{5,8} emake \ DESTDIR="${D}" \ - SYSTEMD=$(usex systemd 1 "") \ + SYSTEMD=$(get_systemd_pv) \ unitdir="$(systemd_get_systemunitdir)" \ libudevdir='${prefix}'/"${udevdir}" \ install