[src/trunk]: src/external/mit/xorg don't build greeter lib with GREET_LIB. i...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ab9fc42fd7e0
branches:  trunk
changeset: 787221:ab9fc42fd7e0
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Jun 06 09:13:41 2013 +0000

description:
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.

diffstat:

 external/mit/xorg/bin/xdm/Makefile         |  10 +++++++---
 external/mit/xorg/lib/libXdmGreet/Makefile |   7 +++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 59660cb30b08 -r ab9fc42fd7e0 external/mit/xorg/bin/xdm/Makefile
--- a/external/mit/xorg/bin/xdm/Makefile        Thu Jun 06 08:34:05 2013 +0000
+++ b/external/mit/xorg/bin/xdm/Makefile        Thu Jun 06 09:13:41 2013 +0000
@@ -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 @@
 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
diff -r 59660cb30b08 -r ab9fc42fd7e0 external/mit/xorg/lib/libXdmGreet/Makefile
--- a/external/mit/xorg/lib/libXdmGreet/Makefile        Thu Jun 06 08:34:05 2013 +0000
+++ b/external/mit/xorg/lib/libXdmGreet/Makefile        Thu Jun 06 09:13:41 2013 +0000
@@ -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 @@
        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 \