Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gdm/
Date: Fri, 30 Apr 2021 19:56:37
Message-Id: 1619812548.45f4f9428cd139f3b31a2d911ea9e4484a2b61f2.mattst88@gentoo
1 commit: 45f4f9428cd139f3b31a2d911ea9e4484a2b61f2
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 30 19:55:45 2021 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 30 19:55:48 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45f4f942
7
8 gnome-base/gdm: Fix build with elogind
9
10 Closes: https://bugs.gentoo.org/787203
11 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
12
13 gnome-base/gdm/gdm-40.0.ebuild | 10 ++++++++--
14 1 file changed, 8 insertions(+), 2 deletions(-)
15
16 diff --git a/gnome-base/gdm/gdm-40.0.ebuild b/gnome-base/gdm/gdm-40.0.ebuild
17 index fdfbc1526ef..7be1ee83162 100644
18 --- a/gnome-base/gdm/gdm-40.0.ebuild
19 +++ b/gnome-base/gdm/gdm-40.0.ebuild
20 @@ -147,8 +147,6 @@ src_configure() {
21 -Drun-dir=/run/gdm
22 $(meson_feature selinux)
23 $(meson_use systemd systemd-journal)
24 - -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
25 - -Dsystemduserunitdir="$(systemd_get_userunitdir)"
26 $(meson_use tcpd tcp-wrappers)
27 -Dudev-dir=$(get_udevdir)
28 -Duser=gdm
29 @@ -160,6 +158,14 @@ src_configure() {
30 if use elogind; then
31 emesonargs+=(
32 -Dinitial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility
33 + -Dsystemdsystemunitdir=no
34 + -Dsystemduserunitdir=no
35 + )
36 + else
37 + emesonargs+=(
38 + -Dinitial-vt=1
39 + -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
40 + -Dsystemduserunitdir="$(systemd_get_userunitdir)"
41 )
42 fi