Module Name: src
Committed By: mrg
Date: Thu Jun 6 09:13:41 UTC 2013
Modified Files:
src/external/mit/xorg/bin/xdm: Makefile
src/external/mit/xorg/lib/libXdmGreet: Makefile
Log Message:
don't build greeter lib with GREET_LIB. it triggers some
sort of problem i haven't yet figured out, and our linker
doesn't need these hacks with --export-dynamic anyway.
if !MKPIC, built the greeter into xdm statically.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/bin/xdm/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libXdmGreet/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xdm/Makefile
diff -u src/external/mit/xorg/bin/xdm/Makefile:1.10 src/external/mit/xorg/bin/xdm/Makefile:1.11
--- src/external/mit/xorg/bin/xdm/Makefile:1.10 Wed Jun 5 00:01:16 2013
+++ src/external/mit/xorg/bin/xdm/Makefile Thu Jun 6 09:13:41 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/06/05 00:01:16 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2013/06/06 09:13:41 mrg Exp $
.include <bsd.own.mk>
@@ -6,8 +6,12 @@ PROG= xdm
SRCS= access.c auth.c choose.c daemon.c dm.c dpylist.c \
error.c file.c genauth.c mitauth.c netaddr.c policy.c \
protodpy.c reset.c resource.c server.c session.c socket.c \
- streams.c util.c xdmauth.c xdmcp.c \
- Login.c greet.c verify.c prngc.c
+ streams.c util.c xdmauth.c xdmcp.c prngc.c
+
+.if ${MKPIC} == "no"
+SRCS+= Login.c greet.c verify.c
+CPPFLAGS+= -DSTATIC_GREETER_LIB
+.endif
CPPFLAGS+= -DRETSIGTYPE=void
CPPFLAGS.auth.c= -DBSD44SOCKETS
Index: src/external/mit/xorg/lib/libXdmGreet/Makefile
diff -u src/external/mit/xorg/lib/libXdmGreet/Makefile:1.2 src/external/mit/xorg/lib/libXdmGreet/Makefile:1.3
--- src/external/mit/xorg/lib/libXdmGreet/Makefile:1.2 Wed Jun 5 00:01:16 2013
+++ src/external/mit/xorg/lib/libXdmGreet/Makefile Thu Jun 6 09:13:41 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/06/05 00:01:16 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/06/06 09:13:41 mrg Exp $
.include <bsd.own.mk>
@@ -11,7 +11,10 @@ SRCS= \
verify.c
CPPFLAGS+= -I${X11SRCDIR.xdm}/include -DRETSIGTYPE=void
-CPPFLAGS+= -DGREET_LIB
+# XXX: Enabling this, which should allow --export-dynamic to
+# be elided, causes xdm to fail to accept password input and
+# then crash at login "failure".
+#CPPFLAGS+= -DGREET_LIB
LIBDPLIBS=\
Xext ${.CURDIR}/../libXext \
