pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
gdm: fix build without the pam option.
Module Name: pkgsrc-wip
Committed By: Benny Siegert <bsiegert%gmail.com@localhost>
Pushed By: bsiegert
Date: Tue Nov 10 16:24:59 2020 +0000
Changeset: d4797d0c26280e8a18618ef8771211e3e46aa719
Modified Files:
gdm/Makefile
gdm/PLIST
gdm/options.mk
Log Message:
gdm: fix build without the pam option.
conditionalize PLIST for pam stuff. While here, also use vt05 on
aarch64 (which is where I am trying this).
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d4797d0c26280e8a18618ef8771211e3e46aa719
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
gdm/Makefile | 3 ++-
gdm/PLIST | 12 ++++++------
gdm/options.mk | 3 +++
3 files changed, 11 insertions(+), 7 deletions(-)
diffs:
diff --git a/gdm/Makefile b/gdm/Makefile
index 7abaeb6214..7d1a7a2f0b 100644
--- a/gdm/Makefile
+++ b/gdm/Makefile
@@ -95,7 +95,8 @@ GDMGRP= daemon
# will receive key presses. And on slow machines, X will have lost access
# to the keyboard.
.if (${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD") && \
- (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
+ (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
+ ${MACHINE_ARCH} == "aarch64")
CONFIGURE_ARGS+= X_SERVER_ARGS="vt05"
.endif
diff --git a/gdm/PLIST b/gdm/PLIST
index 94755c9401..1d7c792bb9 100644
--- a/gdm/PLIST
+++ b/gdm/PLIST
@@ -23,12 +23,12 @@ share/examples/gdm/PostSession/Default
share/examples/gdm/PreSession/Default
share/examples/gdm/Xsession
share/examples/gdm/custom.conf
-share/examples/gdm/pam.d/gdm-autologin
-share/examples/gdm/pam.d/gdm-fingerprint
-share/examples/gdm/pam.d/gdm-launch-environment
-share/examples/gdm/pam.d/gdm-password
-share/examples/gdm/pam.d/gdm-pin
-share/examples/gdm/pam.d/gdm-smartcard
+${PLIST.pam}share/examples/gdm/pam.d/gdm-autologin
+${PLIST.pam}share/examples/gdm/pam.d/gdm-fingerprint
+${PLIST.pam}share/examples/gdm/pam.d/gdm-launch-environment
+${PLIST.pam}share/examples/gdm/pam.d/gdm-password
+${PLIST.pam}share/examples/gdm/pam.d/gdm-pin
+${PLIST.pam}share/examples/gdm/pam.d/gdm-smartcard
share/examples/pam.d/gdm-launch-environment
share/gdm/BuiltInSessions/custom.desktop
share/gdm/gdb-cmd
diff --git a/gdm/options.mk b/gdm/options.mk
index 09e06feed4..209ca45efc 100644
--- a/gdm/options.mk
+++ b/gdm/options.mk
@@ -21,9 +21,12 @@ CONFIGURE_ARGS+= --with-console-kit=yes
CONFIGURE_ARGS+= --with-console-kit=no
.endif
+PLIST_VARS+= pam
+
.if !empty(PKG_OPTIONS:Mpam)
. include "../../mk/pam.buildlink3.mk"
CONFIGURE_ARGS+= --enable-authentication-scheme=pam
+PLIST.pam= yes
.elif exists(/etc/shadow)
CONFIGURE_ARGS+= --enable-authentication-scheme=shadow
.else
Home |
Main Index |
Thread Index |
Old Index