Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/mit/xorg/bin/xsm make build with new libXt.



details:   https://anonhg.NetBSD.org/src/rev/80ccb20f5346
branches:  trunk
changeset: 982814:80ccb20f5346
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Apr 26 22:04:51 2021 +0000

description:
make build with new libXt.

diffstat:

 external/mit/xorg/bin/xdm/chooser/Makefile |  8 ++++++--
 external/mit/xorg/bin/xsm/Makefile         |  5 ++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diffs (44 lines):

diff -r f5154fdfb8d9 -r 80ccb20f5346 external/mit/xorg/bin/xdm/chooser/Makefile
--- a/external/mit/xorg/bin/xdm/chooser/Makefile        Mon Apr 26 21:54:56 2021 +0000
+++ b/external/mit/xorg/bin/xdm/chooser/Makefile        Mon Apr 26 22:04:51 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2019/03/06 12:40:23 nakayama Exp $
+#      $NetBSD: Makefile,v 1.6 2021/04/26 22:04:51 mrg Exp $
 
 NOMAN= 1
 
@@ -6,7 +6,8 @@
 
 PROG=  chooser
 
-CPPFLAGS.chooser.c+=   -DBSD44SOCKETS -DRETSIGTYPE=void
+CPPFLAGS+=     -DBSD44SOCKETS -DRETSIGTYPE=void
+CPPFLAGS+=     -D_CONST_X_STRING=1
 
 APPDEFS=Chooser
 
@@ -21,3 +22,6 @@
 .include <bsd.prog.mk>
 
 .PATH: ${X11SRCDIR.xdm}/app-defaults
+
+# XXX libXt
+COPTS.chooser.c+=      -Wno-incompatible-pointer-types
diff -r f5154fdfb8d9 -r 80ccb20f5346 external/mit/xorg/bin/xsm/Makefile
--- a/external/mit/xorg/bin/xsm/Makefile        Mon Apr 26 21:54:56 2021 +0000
+++ b/external/mit/xorg/bin/xsm/Makefile        Mon Apr 26 22:04:51 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2013/05/31 08:02:00 mrg Exp $
+#      $NetBSD: Makefile,v 1.4 2021/04/26 22:04:51 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -26,5 +26,8 @@
 .PATH: ${X11SRCDIR.${PROG}}
 .PATH: ${X11SRCDIR.${PROG}}/man
 
+# XXX libXt
+COPTS+=                -Wno-incompatible-pointer-types
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>



Home | Main Index | Thread Index | Old Index