mate-extra/mate-system-monitor: fix quoting for pkg-config

Bug: https://bugs.gentoo.org/756238 Signed-off-by: Mike Gilbert <[email protected]>
hanetzer · Dec 14, 2020 · 59f1666 · 59f1666
1 parent 46b2d4e
commit 59f1666
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.24.0.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.24.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit mate
+inherit mate toolchain-funcs
 
 if [[ ${PV} != 9999 ]]; then
 	KEYWORDS="amd64 ~arm ~arm64 x86"
@@ -51,9 +51,10 @@ src_configure() {
 	if use elogind || use systemd; then
 		myconf+=( --enable-systemd )
 		if use elogind; then
+			local pkgconfig="$(tc-getPKG_CONFIG)"
 			myconf+=(
-				SYSTEMD_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
-				SYSTEMD_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
+				SYSTEMD_CFLAGS="$(${pkgconfig} --cflags "libelogind")"
+				SYSTEMD_LIBS="$(${pkgconfig} --libs "libelogind")"
 			)
 		fi
 	else

diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.24.1.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.24.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit mate
+inherit mate toolchain-funcs
 
 if [[ ${PV} != 9999 ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
@@ -51,9 +51,10 @@ src_configure() {
 	if use elogind || use systemd; then
 		myconf+=( --enable-systemd )
 		if use elogind; then
+			local pkgconfig="$(tc-getPKG_CONFIG)"
 			myconf+=(
-				SYSTEMD_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
-				SYSTEMD_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
+				SYSTEMD_CFLAGS="$(${pkgconfig} --cflags "libelogind")"
+				SYSTEMD_LIBS="$(${pkgconfig} --libs "libelogind")"
 			)
 		fi
 	else