commit: a7e8b798856ce4d5b295005637b00b4921bd732c Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sun Dec 13 03:06:54 2020 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> 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 <floppym <AT> 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[@]}"
