[pkgsrc/trunk]: pkgsrc/x11/modular-xorg-server xorg-server: try to mend build...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/889e38cd05a8
branches:  trunk
changeset: 454961:889e38cd05a8
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Thu Jun 24 15:38:41 2021 +0000

description:
xorg-server: try to mend build on Linux

XXX I don't see how the pkg/56169 fix can work on SunOS, which doesn't have
strlcpy either. Maybe it fixes modular-xorg-xephyr but breaks
modular-xorg-server?

diffstat:

 x11/modular-xorg-server/Makefile.common |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r 15d6c7337ba1 -r 889e38cd05a8 x11/modular-xorg-server/Makefile.common
--- a/x11/modular-xorg-server/Makefile.common   Thu Jun 24 15:25:04 2021 +0000
+++ b/x11/modular-xorg-server/Makefile.common   Thu Jun 24 15:38:41 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.40 2021/06/08 22:51:11 khorben Exp $
+# $NetBSD: Makefile.common,v 1.41 2021/06/24 15:38:41 tnn Exp $
 # used by x11/modular-xorg-server/Makefile
 # used by x11/modular-xorg-xephyr/Makefile
 # used by x11/modular-xorg-xwayland/Makefile
@@ -15,7 +15,6 @@
 USE_LIBTOOL=   yes
 USE_TOOLS+=    gmake pkg-config
 USE_LANGUAGES+=        c99
-USE_FEATURES+= strnlen err
 
 CHECK_PORTABILITY_SKIP+=       hw/xquartz/bundle/mk_bundke.sh
 
@@ -40,7 +39,13 @@
 DEPENDS+=      xkeyboard-config-[0-9]*:../../x11/xkeyboard-config
 
 .include "../../mk/bsd.prefs.mk"
-
+.if ${OPSYS} == "SunOS"
+# XXX this brings in libnbcompat and it's namespace pollution that
+# can cause all sorts of problems. In particular it causes strlcpy
+# conflicts on Linux.
+# (since modular-xorg-server ships with it's own strlcpy replacement)
+USE_FEATURES+= strnlen err
+.endif
 .if ${OPSYS} == "NetBSD"
 CPPFLAGS+=             -D_OPENBSD_SOURCE       # for reallocarray(3)
 CONFIGURE_ARGS+=       --with-builder-addr="tech-x11%NetBSD.org@localhost"