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 9AE181382C5 for ; Mon, 14 Dec 2020 16:47:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B2973E091A; Mon, 14 Dec 2020 16:47:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9C8CBE091C for ; Mon, 14 Dec 2020 16:47:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A97B8341262 for ; Mon, 14 Dec 2020 16:47:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 28C10C0 for ; Mon, 14 Dec 2020 16:47:04 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1607964318.a7e8b798856ce4d5b295005637b00b4921bd732c.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/modemmanager/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/modemmanager/modemmanager-1.10.0.ebuild net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild X-VCS-Directories: net-misc/modemmanager/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: a7e8b798856ce4d5b295005637b00b4921bd732c X-VCS-Branch: master Date: Mon, 14 Dec 2020 16:47:04 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 970c4b03-4f16-46b4-afdd-c6938503196e X-Archives-Hash: a5ef5469c319ab2abc4865274e2c1482 commit: a7e8b798856ce4d5b295005637b00b4921bd732c Author: Mike Gilbert gentoo org> AuthorDate: Sun Dec 13 03:06:54 2020 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Dec 14 16:45:18 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7e8b798 net-misc/modemmanager: fix quoting for pkg-config Closes: https://bugs.gentoo.org/756238 Signed-off-by: Mike Gilbert gentoo.org> net-misc/modemmanager/modemmanager-1.10.0.ebuild | 7 ++++--- net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/net-misc/modemmanager/modemmanager-1.10.0.ebuild b/net-misc/modemmanager/modemmanager-1.10.0.ebuild index 0973aa512ed..7f108b8d46e 100644 --- a/net-misc/modemmanager/modemmanager-1.10.0.ebuild +++ b/net-misc/modemmanager/modemmanager-1.10.0.ebuild @@ -5,7 +5,7 @@ EAPI=6 GNOME2_LA_PUNT="yes" VALA_USE_DEPEND="vapigen" -inherit gnome2 readme.gentoo-r1 systemd udev vala +inherit gnome2 readme.gentoo-r1 systemd toolchain-funcs udev vala DESCRIPTION="Modem and mobile broadband management libraries" HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/" @@ -75,10 +75,11 @@ src_configure() { $(use_enable vala) ) if use elogind; then + local pkgconfig="$(tc-getPKG_CONFIG)" myconf+=( --with-systemd-suspend-resume - LIBSYSTEMD_LOGIN_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null` - LIBSYSTEMD_LOGIN_LIBS=`pkg-config --libs "libelogind" 2>/dev/null` + LIBSYSTEMD_LOGIN_CFLAGS="$(${pkgconfig} --cflags "libelogind")" + LIBSYSTEMD_LOGIN_LIBS="$(${pkgconfig} --libs "libelogind")" ) fi gnome2_src_configure "${myconf[@]}" diff --git a/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild b/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild index 1e50b9f22e5..347bb0a5d5f 100644 --- a/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild +++ b/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild @@ -5,7 +5,7 @@ EAPI=6 GNOME2_LA_PUNT="yes" VALA_USE_DEPEND="vapigen" -inherit gnome2 readme.gentoo-r1 systemd udev vala +inherit gnome2 readme.gentoo-r1 systemd toolchain-funcs udev vala DESCRIPTION="Modem and mobile broadband management libraries" HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/" @@ -75,10 +75,11 @@ src_configure() { $(use_enable vala) ) if use elogind; then + local pkgconfig="$(tc-getPKG_CONFIG)" myconf+=( --with-systemd-suspend-resume - LIBSYSTEMD_LOGIN_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null` - LIBSYSTEMD_LOGIN_LIBS=`pkg-config --libs "libelogind" 2>/dev/null` + LIBSYSTEMD_LOGIN_CFLAGS="$(${pkgconfig} --cflags "libelogind")" + LIBSYSTEMD_LOGIN_LIBS="$(${pkgconfig} --libs "libelogind")" ) fi gnome2_src_configure "${myconf[@]}"