Source-Changes-HG archive

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

[src/trunk]: src/external/mit/xorg define IPv6 unless not building INET6.



details:   https://anonhg.NetBSD.org/src/rev/4c8385238ee3
branches:  trunk
changeset: 995742:4c8385238ee3
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Jan 03 23:39:47 2019 +0000

description:
define IPv6 unless not building INET6.

diffstat:

 external/mit/xorg/bin/proxymngr/Makefile |  6 +++++-
 external/mit/xorg/bin/xauth/Makefile     |  6 +++++-
 external/mit/xorg/bin/xhost/Makefile     |  6 +++++-
 external/mit/xorg/lib/libSM/Makefile     |  6 +++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diffs (80 lines):

diff -r d055326ead3b -r 4c8385238ee3 external/mit/xorg/bin/proxymngr/Makefile
--- a/external/mit/xorg/bin/proxymngr/Makefile  Thu Jan 03 23:26:58 2019 +0000
+++ b/external/mit/xorg/bin/proxymngr/Makefile  Thu Jan 03 23:39:47 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2008/10/14 23:37:19 cube Exp $
+#      $NetBSD: Makefile,v 1.3 2019/01/03 23:39:47 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -23,6 +23,10 @@
 LDADD+=        -lXt -lSM -lICE -lXext -lX11
 DPADD+=        ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
 
+.if (${USE_INET6} != "no")
+CPPFLAGS+=      -DIPv6
+.endif
+
 .PATH: ${X11SRCDIR.${PROG}}
 
 .include <bsd.x11.mk>
diff -r d055326ead3b -r 4c8385238ee3 external/mit/xorg/bin/xauth/Makefile
--- a/external/mit/xorg/bin/xauth/Makefile      Thu Jan 03 23:26:58 2019 +0000
+++ b/external/mit/xorg/bin/xauth/Makefile      Thu Jan 03 23:39:47 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2017/03/04 23:23:21 mrg Exp $
+#      $NetBSD: Makefile,v 1.7 2019/01/03 23:39:47 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -10,6 +10,10 @@
 CPPFLAGS.gethost.c=    ${X11FLAGS.CONNECTION}
 CPPFLAGS.parsedpy.c=   ${X11FLAGS.CONNECTION}
 
+.if (${USE_INET6} != "no")
+CPPFLAGS+=             -DIPv6
+.endif
+
 CWARNFLAGS.clang=      -Wno-empty-body
 
 LDADD+=        -lXau -lXmuu -lXt -lSM -lICE -lXext -lX11
diff -r d055326ead3b -r 4c8385238ee3 external/mit/xorg/bin/xhost/Makefile
--- a/external/mit/xorg/bin/xhost/Makefile      Thu Jan 03 23:26:58 2019 +0000
+++ b/external/mit/xorg/bin/xhost/Makefile      Thu Jan 03 23:39:47 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2013/05/31 07:22:21 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2019/01/03 23:39:47 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -6,6 +6,10 @@
 
 CPPFLAGS+=${X11FLAGS.CONNECTION} -DBSD44SOCKETS
 
+.if (${USE_INET6} != "no")
+CPPFLAGS+=      -DIPv6
+.endif
+
 LDADD+=        -lXmuu -lXt -lSM -lICE -lXext -lX11
 DPADD+=        ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
 
diff -r d055326ead3b -r 4c8385238ee3 external/mit/xorg/lib/libSM/Makefile
--- a/external/mit/xorg/lib/libSM/Makefile      Thu Jan 03 23:26:58 2019 +0000
+++ b/external/mit/xorg/lib/libSM/Makefile      Thu Jan 03 23:39:47 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2008/09/13 04:32:30 cube Exp $
+#      $NetBSD: Makefile,v 1.4 2019/01/03 23:39:47 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -19,6 +19,10 @@
 CPPFLAGS.sm_manager.c= $(CONN_DEFINES)
 CPPFLAGS.sm_genid.c=   $(CONN_DEFINES)
 
+.if (${USE_INET6} != "no")
+CPPFLAGS+=      -DIPv6
+.endif
+
 LIBDPLIBS=ICE ${.CURDIR}/../libICE
 
 # XXXMRG



Home | Main Index | Thread Index | Old Index