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 23AB21382C5 for ; Mon, 14 Dec 2020 16:47:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F3224E091F; Mon, 14 Dec 2020 16:47:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 D9E3CE091F for ; Mon, 14 Dec 2020 16:47:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 8F208341260 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 013C0B9 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: <1607964317.46b2d4e7cd4e4859bb33eeb8863cd5b1e6a7ac4a.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gdm/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-base/gdm/gdm-3.36.3.ebuild gnome-base/gdm/gdm-3.36.4.ebuild X-VCS-Directories: gnome-base/gdm/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 46b2d4e7cd4e4859bb33eeb8863cd5b1e6a7ac4a 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: 2d2682aa-f121-4eb2-9c6b-bc439330a556 X-Archives-Hash: dadfba3713eb07f50893c1e16f77ced6 commit: 46b2d4e7cd4e4859bb33eeb8863cd5b1e6a7ac4a Author: Mike Gilbert gentoo org> AuthorDate: Sun Dec 13 03:01:33 2020 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Dec 14 16:45:17 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46b2d4e7 gnome-base/gdm: fix quoting for pkg-config Bug: https://bugs.gentoo.org/756238 Signed-off-by: Mike Gilbert gentoo.org> 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 7b8b1e592dc..93db1164a50 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 12a42230f31..8a86e224747 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