Module Name: src
Committed By: mrg
Date: Sun Mar 9 06:03:52 UTC 2025
Modified Files:
src/external/mit/xorg/lib/libSM: Makefile
src/external/mit/xorg/lib/libX11: Makefile.libx11
src/external/mit/xorg/lib/libXau: Makefile
src/external/mit/xorg/lib/libxshmfence: Makefile
Log Message:
variously define DHAVE_GETADDRINFO, HAVE_INET_NTOP,
HAVE_STRUCT_SOCKADDR_STORAGE, HAVE_EXPLICIT_MEMSET, HAVE_PATHCONF,
and HAVE_UNISTD_H.
comment define for HAVE_MEMFD_CREATE in libxshmfence, needs testing.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libSM/Makefile
cvs rdiff -u -r1.26 -r1.27 src/external/mit/xorg/lib/libX11/Makefile.libx11
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libXau/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libxshmfence/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libSM/Makefile
diff -u src/external/mit/xorg/lib/libSM/Makefile:1.5 src/external/mit/xorg/lib/libSM/Makefile:1.6
--- src/external/mit/xorg/lib/libSM/Makefile:1.5 Sun Jan 8 09:10:58 2023
+++ src/external/mit/xorg/lib/libSM/Makefile Sun Mar 9 06:03:51 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/01/08 09:10:58 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2025/03/09 06:03:51 mrg Exp $
.include <bsd.own.mk>
@@ -15,6 +15,8 @@ INCSDIR=${X11INCDIR}/X11/SM
CPPFLAGS+= ${X11FLAGS.THREADLIB}
# XXX not yet; libuuid_ul is not yet ready.
#CPPFLAGS+= -DHAVE_LIBUUID
+CPPFLAGS+= -DHAVE_GETADDRINFO -DHAVE_INET_NTOP \
+ -DHAVE_STRUCT_SOCKADDR_STORAGE
CONN_DEFINES= ${X11FLAGS.CONNECTION} -DICE_t
Index: src/external/mit/xorg/lib/libX11/Makefile.libx11
diff -u src/external/mit/xorg/lib/libX11/Makefile.libx11:1.26 src/external/mit/xorg/lib/libX11/Makefile.libx11:1.27
--- src/external/mit/xorg/lib/libX11/Makefile.libx11:1.26 Sat Oct 7 12:15:52 2023
+++ src/external/mit/xorg/lib/libX11/Makefile.libx11 Sun Mar 9 06:03:51 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libx11,v 1.26 2023/10/07 12:15:52 rin Exp $
+# $NetBSD: Makefile.libx11,v 1.27 2025/03/09 06:03:51 mrg Exp $
LIB= X11
.PATH: ${X11SRCDIR.${LIB}}/src
@@ -407,6 +407,7 @@ CPPFLAGS+= -DHAVE_SYS_FILIO_H -DHAVE_SYS
CPPFLAGS+= -DHAVE_REALLOCARRAY
CPPFLAGS+= -DHAVE_STRCASECMP -DHAVE_STRLCPY -DHAVE___BUILTIN_POPCOUNTL
CPPFLAGS+= -DUSE_THREAD_SAFETY_CONSTRUCTOR
+CPPFLAGS+= -DHAVE_GETADDRINFO -DHAVE_INET_NTOP -DHAVE_STRUCT_SOCKADDR_STORAGE
CPPFLAGS+= -DUSE_XCB
SRCS+= \
Index: src/external/mit/xorg/lib/libXau/Makefile
diff -u src/external/mit/xorg/lib/libXau/Makefile:1.5 src/external/mit/xorg/lib/libXau/Makefile:1.6
--- src/external/mit/xorg/lib/libXau/Makefile:1.5 Fri May 31 00:38:16 2013
+++ src/external/mit/xorg/lib/libXau/Makefile Sun Mar 9 06:03:51 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2013/05/31 00:38:16 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2025/03/09 06:03:51 mrg Exp $
.include <bsd.own.mk>
@@ -14,6 +14,7 @@ INCS= Xauth.h
INCSDIR=${X11INCDIR}/X11
CPPFLAGS+= ${X11FLAGS.THREADLIB}
+CPPFLAGS+= -DHAVE_EXPLICIT_MEMSET -DHAVE_PATHCONF -DHAVE_UNISTD_H
MAN= Xau.3
MLINKS= Xau.3 XauDisposeAuth.3 \
Index: src/external/mit/xorg/lib/libxshmfence/Makefile
diff -u src/external/mit/xorg/lib/libxshmfence/Makefile:1.6 src/external/mit/xorg/lib/libxshmfence/Makefile:1.7
--- src/external/mit/xorg/lib/libxshmfence/Makefile:1.6 Sun Mar 5 11:52:39 2017
+++ src/external/mit/xorg/lib/libxshmfence/Makefile Sun Mar 9 06:03:51 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/03/05 11:52:39 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2025/03/09 06:03:51 mrg Exp $
.include <bsd.own.mk>
@@ -15,6 +15,8 @@ CPPFLAGS+= -DSHMDIR=\"/var/shm\"
CPPFLAGS+= -DHAVE_SEMAPHORE
# XXX
CPPFLAGS+= -DLIBXSHM_PAGESIZE=4096
+# XXX needs testing
+#CPPFLAGS+= -DHAVE_MEMFD_CREATE
LDADD+= -lrt
DPADD+= ${LIBRT}
