Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
mrg 2013-06-06 09:13:41 +00:00
parent d067cd1c6c
commit d5fe81af2a
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
external/mit/xorg/bin/xdm/Makefile vendored
View File

@ -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

7
external/mit/xorg/lib/libXdmGreet/Makefile vendored
View File

@ -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 \