Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src install libXdmGreet.so so xdm works again.
details: https://anonhg.NetBSD.org/src/rev/9302184e3894
branches: trunk
changeset: 787143:9302184e3894
user: mrg <mrg%NetBSD.org@localhost>
date: Mon Jun 03 23:25:43 2013 +0000
description:
install libXdmGreet.so so xdm works again.
requires linking xdm with --export-dynamic.
diffstat:
distrib/sets/lists/xbase/shl.mi | 5 ++++-
distrib/sets/lists/xcomp/mi | 5 ++++-
distrib/sets/lists/xcomp/shl.mi | 3 ++-
distrib/sets/lists/xdebug/mi | 3 ++-
distrib/sets/lists/xdebug/shl.mi | 3 ++-
external/mit/xorg/bin/xdm/Makefile.xdm | 6 ++++--
external/mit/xorg/lib/libXdmGreet/Makefile | 24 ++++++++++++++++++++++++
external/mit/xorg/lib/libXdmGreet/shlib_version | 4 ++++
8 files changed, 46 insertions(+), 7 deletions(-)
diffs (156 lines):
diff -r a730ce6a5e2c -r 9302184e3894 distrib/sets/lists/xbase/shl.mi
--- a/distrib/sets/lists/xbase/shl.mi Mon Jun 03 23:02:43 2013 +0000
+++ b/distrib/sets/lists/xbase/shl.mi Mon Jun 03 23:25:43 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.49 2013/06/03 20:23:40 mrg Exp $
+# $NetBSD: shl.mi,v 1.50 2013/06/03 23:25:43 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -219,6 +219,9 @@
./usr/X11R7/lib/libXdamage.so -unknown- xorg
./usr/X11R7/lib/libXdamage.so.2 -unknown- xorg
./usr/X11R7/lib/libXdamage.so.2.0 -unknown- xorg
+./usr/X11R7/lib/libXdmGreet.so -unknown- xorg
+./usr/X11R7/lib/libXdmGreet.so.0 -unknown- xorg
+./usr/X11R7/lib/libXdmGreet.so.0.0 -unknown- xorg
./usr/X11R7/lib/libXdmcp.so -unknown- xorg
./usr/X11R7/lib/libXdmcp.so.7 -unknown- xorg
./usr/X11R7/lib/libXdmcp.so.7.0 -unknown- xorg
diff -r a730ce6a5e2c -r 9302184e3894 distrib/sets/lists/xcomp/mi
--- a/distrib/sets/lists/xcomp/mi Mon Jun 03 23:02:43 2013 +0000
+++ b/distrib/sets/lists/xcomp/mi Mon Jun 03 23:25:43 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.137 2013/06/03 07:08:21 mrg Exp $
+# $NetBSD: mi,v 1.138 2013/06/03 23:25:43 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -6123,6 +6123,8 @@
./usr/X11R7/lib/libXcursor_p.a -unknown- profile,xorg
./usr/X11R7/lib/libXdamage.a -unknown- xorg
./usr/X11R7/lib/libXdamage_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libXdmGreet.a -unknown- xorg
+./usr/X11R7/lib/libXdmGreet_p.a -unknown- profile,xorg
./usr/X11R7/lib/libXdmcp.a -unknown- xorg
./usr/X11R7/lib/libXdmcp_p.a -unknown- profile,xorg
./usr/X11R7/lib/libXevie.a -unknown- xorg
@@ -9170,6 +9172,7 @@
./usr/libdata/lint/llib-lXcursor.ln -unknown- lint,x11
./usr/libdata/lint/llib-lXcursor.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lXdamage.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-lXdmGreet.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lXdmcp.ln -unknown- lint,x11
./usr/libdata/lint/llib-lXdmcp.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lXevie.ln -unknown- lint,xorg
diff -r a730ce6a5e2c -r 9302184e3894 distrib/sets/lists/xcomp/shl.mi
--- a/distrib/sets/lists/xcomp/shl.mi Mon Jun 03 23:02:43 2013 +0000
+++ b/distrib/sets/lists/xcomp/shl.mi Mon Jun 03 23:25:43 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.32 2013/01/16 16:01:09 christos Exp $
+# $NetBSD: shl.mi,v 1.33 2013/06/03 23:25:43 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -64,6 +64,7 @@
./usr/X11R7/lib/libXcomposite_pic.a -unknown- xorg
./usr/X11R7/lib/libXcursor_pic.a -unknown- xorg
./usr/X11R7/lib/libXdamage_pic.a -unknown- xorg
+./usr/X11R7/lib/libXdmGreet_pic.a -unknown- xorg
./usr/X11R7/lib/libXdmcp_pic.a -unknown- xorg
./usr/X11R7/lib/libXevie_pic.a -unknown- xorg
./usr/X11R7/lib/libXext_pic.a -unknown- xorg
diff -r a730ce6a5e2c -r 9302184e3894 distrib/sets/lists/xdebug/mi
--- a/distrib/sets/lists/xdebug/mi Mon Jun 03 23:02:43 2013 +0000
+++ b/distrib/sets/lists/xdebug/mi Mon Jun 03 23:25:43 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.4 2013/06/03 20:23:40 mrg Exp $
+# $NetBSD: mi,v 1.5 2013/06/03 23:25:43 mrg Exp $
./etc/mtree/set.xdebug comp-sys-root
./usr/libdata/debug/usr/X11R6/bin/Xdmx.debug -unknown- debug,x11
./usr/libdata/debug/usr/X11R6/bin/Xnest.debug -unknown- debug,x11
@@ -329,6 +329,7 @@
./usr/X11R7/lib/libXcomposite_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libXcursor_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libXdamage_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libXdmGreet_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libXdmcp_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libXevie_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libXext_g.a -unknown- debuglib,xorg
diff -r a730ce6a5e2c -r 9302184e3894 distrib/sets/lists/xdebug/shl.mi
--- a/distrib/sets/lists/xdebug/shl.mi Mon Jun 03 23:02:43 2013 +0000
+++ b/distrib/sets/lists/xdebug/shl.mi Mon Jun 03 23:25:43 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.8 2013/06/03 20:23:40 mrg Exp $
+# $NetBSD: shl.mi,v 1.9 2013/06/03 23:25:43 mrg Exp $
./usr/libdata/debug/usr/X11R6/lib/libFS.so.6.0.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGL.so.1.2.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGLU.so.1.3.debug -unknown- x11,debug
@@ -75,6 +75,7 @@
./usr/libdata/debug/usr/X11R7/lib/libXcomposite.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXcursor.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXdamage.so.2.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libXdmGreet.so.0.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXdmcp.so.7.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXevie.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXext.so.7.1.debug -unknown- xorg,debug
diff -r a730ce6a5e2c -r 9302184e3894 external/mit/xorg/bin/xdm/Makefile.xdm
--- a/external/mit/xorg/bin/xdm/Makefile.xdm Mon Jun 03 23:02:43 2013 +0000
+++ b/external/mit/xorg/bin/xdm/Makefile.xdm Mon Jun 03 23:25:43 2013 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.xdm,v 1.6 2013/05/31 22:49:15 mrg Exp $
+# $NetBSD: Makefile.xdm,v 1.7 2013/06/03 23:25:43 mrg Exp $
XDMVARDIR= /var/db/xdm
XDMDIR= ${X11ETCDIR}/xdm
XDMCHOOSERPATH= ${X11ROOTDIR}/libexec/chooser
-XDMGREETERLIB= ${X11ROOTDIR}/libexec/libXdmGreet.so
+XDMGREETERLIB= ${X11ROOTDIR}/lib/libXdmGreet.so
XDMLOGDIR= /var/log
XDMPIDDIR= /var/run
@@ -26,6 +26,8 @@
-I${X11SRCDIR.xdm}/include \
${X11FLAGS.VERSION}
+LDFLAGS+= -Wl,--export-dynamic
+
.if (${USE_PAM} != "no")
CPPFLAGS+= -DUSE_PAM
.endif
diff -r a730ce6a5e2c -r 9302184e3894 external/mit/xorg/lib/libXdmGreet/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/libXdmGreet/Makefile Mon Jun 03 23:25:43 2013 +0000
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.1 2013/06/03 23:25:43 mrg Exp $
+
+.include <bsd.own.mk>
+
+LIB= XdmGreet
+.PATH: ${X11SRCDIR.xdm}/greeter
+
+SRCS= \
+ Login.c \
+ greet.c \
+ verify.c
+
+CPPFLAGS+= -I${X11SRCDIR.xdm}/include -DRETSIGTYPE=void
+
+.if 0
+CPPFLAGS+= ${X11FLAGS.THREADLIB} \
+ -DHAVE_XEXTPROTO_71 \
+ -DXSERVER_LIBPCIACCESS \
+ -DTRUE=1 -DFALSE=0 \
+ -I${DESTDIR}${X11INCDIR}/xorg
+.endif
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
diff -r a730ce6a5e2c -r 9302184e3894 external/mit/xorg/lib/libXdmGreet/shlib_version
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/libXdmGreet/shlib_version Mon Jun 03 23:25:43 2013 +0000
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2013/06/03 23:25:43 mrg Exp $
+#
+major=0
+minor=0
Home |
Main Index |
Thread Index |
Old Index