CVS commit: pkgsrc/x11/modular-xorg-xwayland

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Fri Jan 24 20:50:27 UTC 2025

Modified Files:
        pkgsrc/x11/modular-xorg-xwayland: Makefile

Log Message:
x11/modular-xorg-xwayland: Fix build on netbsd<10.

Needs _OPENBSD_SOURCE for reallocarray, from the days before it was
(unfortunately) added to POSIX.

Resolves:

===> Building for modular-xorg-xwayland-23.1.1nb1
ninja: Entering directory `output'
[1/433] Compiling C object dix/liblibxserver_dix.a.p/atom.c.o
FAILED: dix/liblibxserver_dix.a.p/atom.c.o
cc -Idix/liblibxserver_dix.a.p -Idix -I../dix -IXext -I../Xext -IXi -I../Xi -Icomposite -I../composite -Idamageext -I../damageext -Ifb -I../fb -Iglamor -I../glamor -Imi -I../mi -Imiext/damage 
-I../miext/damage -Imiext/sync -I../miext/sync -Idbe -I../dbe -Idri3 -I../dri3 -Iinclude -I../include -Ipresent -I../present -Irandr -I../randr -Irender -I../render -Ixfixes -I../xfixes 
-I/pkg/2024Q4/include -I/pkg/2024Q4/include/pixman-1 -I/pkg/2024Q4/include/freetype2 -I/pkg/2024Q4/include/libpng16 -I/pkg/2024Q4/include/libdrm -I/usr/include -fdiagnostics-color=always 
-D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=gnu99 -DHAVE_DIX_CONFIG_H -fno-strict-aliasing -fvisibility=hidden -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes 
-Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Werror=implicit 
-Werror=nonnull -Werror=init-self -Wer
ror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast 
-Werror=pointer-to-int-cast -O2 -fPIC -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT -D_DEFAULT_SOURCE -D_BSD_SOURCE -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT -MD -MQ dix/liblibxserver_dix.a.p/atom.c.o -MF 
dix/liblibxserver_dix.a.p/atom.c.o.d -o dix/liblibxserver_dix.a.p/atom.c.o -c ../dix/atom.c
../dix/atom.c: In function 'MakeAtom':
../dix/atom.c:120:21: error: implicit declaration of function 'reallocarray'; did you mean 'reallocarr'? [-Werror=implicit-function-declaration]
             table = reallocarray(nodeTable, tableLength, 2 * sizeof(NodePtr));
                     ^~~~~~~~~~~~
                     reallocarr


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/modular-xorg-xwayland/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/modular-xorg-xwayland/Makefile
diff -u pkgsrc/x11/modular-xorg-xwayland/Makefile:1.19 pkgsrc/x11/modular-xorg-xwayland/Makefile:1.20
--- pkgsrc/x11/modular-xorg-xwayland/Makefile:1.19      Tue Jan 21 14:35:47 2025
+++ pkgsrc/x11/modular-xorg-xwayland/Makefile   Fri Jan 24 20:50:27 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2025/01/21 14:35:47 nia Exp $
+# $NetBSD: Makefile,v 1.20 2025/01/24 20:50:27 riastradh Exp $
 
 DISTNAME=      xwayland-23.1.1
 PKGNAME=       modular-xorg-${DISTNAME}
@@ -14,6 +14,12 @@ LICENSE=     mit AND modified-bsd AND x11 # 
 
 USE_TOOLS+=    pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 100000
+CPPFLAGS+=     -D_OPENBSD_SOURCE # reallocarray
+.endif
+
 .include "../../devel/wayland/platform.mk"
 
 .if empty(PLATFORM_SUPPORTS_WAYLAND:M[Yy][Ee][Ss])