From d5fe81af2a17f7fea08c19bfb15308ec839e7e03 Mon Sep 17 00:00:00 2001 From: mrg Date: Thu, 6 Jun 2013 09:13:41 +0000 Subject: [PATCH] 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. --- external/mit/xorg/bin/xdm/Makefile | 10 +++++++--- external/mit/xorg/lib/libXdmGreet/Makefile | 7 +++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/external/mit/xorg/bin/xdm/Makefile b/external/mit/xorg/bin/xdm/Makefile index e0559f2932a8..fc2e9bacf363 100644 --- a/external/mit/xorg/bin/xdm/Makefile +++ b/external/mit/xorg/bin/xdm/Makefile @@ -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 @@ -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 diff --git a/external/mit/xorg/lib/libXdmGreet/Makefile b/external/mit/xorg/lib/libXdmGreet/Makefile index d11bf531aedd..1717c350925d 100644 --- a/external/mit/xorg/lib/libXdmGreet/Makefile +++ b/external/mit/xorg/lib/libXdmGreet/Makefile @@ -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 @@ -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 \