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 6254F1382C5 for ; Fri, 30 Apr 2021 19:56:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97011E0830; Fri, 30 Apr 2021 19:56:36 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 7C61BE0830 for ; Fri, 30 Apr 2021 19:56:36 +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 80FDA340A5D for ; Fri, 30 Apr 2021 19:56:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2CC2A4C3 for ; Fri, 30 Apr 2021 19:56:34 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1619812548.45f4f9428cd139f3b31a2d911ea9e4484a2b61f2.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gdm/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-base/gdm/gdm-40.0.ebuild X-VCS-Directories: gnome-base/gdm/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 45f4f9428cd139f3b31a2d911ea9e4484a2b61f2 X-VCS-Branch: master Date: Fri, 30 Apr 2021 19:56:34 +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: 569844ab-0adf-4115-bdd6-9942b0dd6798 X-Archives-Hash: ae83c64cb68c5fe3999498c059adb382 commit: 45f4f9428cd139f3b31a2d911ea9e4484a2b61f2 Author: Matt Turner gentoo org> AuthorDate: Fri Apr 30 19:55:45 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Apr 30 19:55:48 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45f4f942 gnome-base/gdm: Fix build with elogind Closes: https://bugs.gentoo.org/787203 Signed-off-by: Matt Turner gentoo.org> gnome-base/gdm/gdm-40.0.ebuild | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnome-base/gdm/gdm-40.0.ebuild b/gnome-base/gdm/gdm-40.0.ebuild index fdfbc1526ef..7be1ee83162 100644 --- a/gnome-base/gdm/gdm-40.0.ebuild +++ b/gnome-base/gdm/gdm-40.0.ebuild @@ -147,8 +147,6 @@ src_configure() { -Drun-dir=/run/gdm $(meson_feature selinux) $(meson_use systemd systemd-journal) - -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)" - -Dsystemduserunitdir="$(systemd_get_userunitdir)" $(meson_use tcpd tcp-wrappers) -Dudev-dir=$(get_udevdir) -Duser=gdm @@ -160,6 +158,14 @@ src_configure() { if use elogind; then emesonargs+=( -Dinitial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility + -Dsystemdsystemunitdir=no + -Dsystemduserunitdir=no + ) + else + emesonargs+=( + -Dinitial-vt=1 + -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)" + -Dsystemduserunitdir="$(systemd_get_userunitdir)" ) fi