From 46b2d4e7cd4e4859bb33eeb8863cd5b1e6a7ac4a Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sat, 12 Dec 2020 22:01:33 -0500 Subject: [PATCH] gnome-base/gdm: fix quoting for pkg-config Bug: https://bugs.gentoo.org/756238 Signed-off-by: Mike Gilbert --- gnome-base/gdm/gdm-3.36.3.ebuild | 7 ++++--- gnome-base/gdm/gdm-3.36.4.ebuild | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gnome-base/gdm/gdm-3.36.3.ebuild b/gnome-base/gdm/gdm-3.36.3.ebuild index 7b8b1e592dcaa..93db1164a50ec 100644 --- a/gnome-base/gdm/gdm-3.36.3.ebuild +++ b/gnome-base/gdm/gdm-3.36.3.ebuild @@ -5,7 +5,7 @@ EAPI=6 GNOME2_LA_PUNT="yes" GNOME2_EAUTORECONF="yes" -inherit eutils gnome2 pam readme.gentoo-r1 systemd udev user +inherit eutils gnome2 pam readme.gentoo-r1 systemd toolchain-funcs udev user DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" HOMEPAGE="https://wiki.gnome.org/Projects/GDM" @@ -187,10 +187,11 @@ src_configure() { ) if use elogind; then + local pkgconfig="$(tc-getPKG_CONFIG)" myconf+=( --with-initial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility - 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 diff --git a/gnome-base/gdm/gdm-3.36.4.ebuild b/gnome-base/gdm/gdm-3.36.4.ebuild index 12a42230f3157..8a86e224747ea 100644 --- a/gnome-base/gdm/gdm-3.36.4.ebuild +++ b/gnome-base/gdm/gdm-3.36.4.ebuild @@ -5,7 +5,7 @@ EAPI=6 GNOME2_LA_PUNT="yes" GNOME2_EAUTORECONF="yes" -inherit eutils gnome2 pam readme.gentoo-r1 systemd udev user +inherit eutils gnome2 pam readme.gentoo-r1 systemd toolchain-funcs udev user DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" HOMEPAGE="https://wiki.gnome.org/Projects/GDM" @@ -187,10 +187,11 @@ src_configure() { ) if use elogind; then + local pkgconfig="$(tc-getPKG_CONFIG)" myconf+=( --with-initial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility - 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