pkgsrc-WIP-changes archive

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

modular-xorg-server: disable dtrace option on NetBSD



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Tue Aug 25 09:17:30 2026 +0200
Changeset:	2f66ad036755215079f63e8aee096bc731b70ef5

Modified Files:
	modular-xorg-server/options.mk

Log Message:
modular-xorg-server: disable dtrace option on NetBSD

dtrace fails reading /usr/lib/dtrace/psinfo.d due to
missing definitions, and if those are fixed, fails to parse
Xserver.d because of its use of #if and #ifdef.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2f66ad036755215079f63e8aee096bc731b70ef5

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

diffstat:
 modular-xorg-server/options.mk | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diffs:
diff --git a/modular-xorg-server/options.mk b/modular-xorg-server/options.mk
index d800c5e96c..171fa13558 100644
--- a/modular-xorg-server/options.mk
+++ b/modular-xorg-server/options.mk
@@ -1,11 +1,21 @@
 # $NetBSD: options.mk,v 1.24 2023/03/30 08:25:06 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.modular-xorg-server
-PKG_SUPPORTED_OPTIONS=	dri dtrace
+PKG_SUPPORTED_OPTIONS=	dri
 PKG_SUGGESTED_OPTIONS=	dri
 
 .include "../../mk/bsd.options.mk"
 
+# not supported on NetBSD
+# FAILED: [code=1] dix/liblibxserver_dix.a.p/Xserver.o
+# /usr/sbin/dtrace -G -s ../include/Xserver.d -o dix/liblibxserver_dix.a.p/Xserver.o
+# dtrace: failed to compile script ../include/Xserver.d: "/usr/lib/dtrace/psinfo.d", line 46: syntax error near "u_int"
+# and if that is fixed,
+# dtrace: failed to compile script ../include/Xserver.d: line 26: invalid control directive: #ifdef
+.if ${OPSYS} != "NetBSD"
+PKG_SUPPORTED_OPTIONS+=	dtrace
+.endif
+
 PLIST_VARS+=		dri # dtrace
 
 PRINT_PLIST_AWK+=	{ if (/include\/xorg\/dri/) $$0 = "$${PLIST.dri}" $$0 }
@@ -41,9 +51,6 @@ MESON_ARGS+=		-Dglx=false
 MESON_ARGS+=		-Dglamor=false
 .endif
 
-# FAILED: [code=1] dix/liblibxserver_dix.a.p/Xserver.o
-# /usr/sbin/dtrace -G -s ../include/Xserver.d -o dix/liblibxserver_dix.a.p/Xserver.o
-# dtrace: failed to compile script ../include/Xserver.d: "/usr/lib/dtrace/psinfo.d", line 46: syntax error near "u_int"
 .if !empty(PKG_OPTIONS:Mdtrace)
 #PLIST.dtrace=		yes
 MESON_ARGS+=		-Ddtrace=true


Home | Main Index | Thread Index | Old Index