Page MenuHomeFreeBSD
Files F177455706

D61415.1794449224.diff
No OneTemporary
Actions

Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None

D61415.1794449224.diff
View Options

diff --git a/graphics/nvidia-drm-kmod/Makefile.common b/graphics/nvidia-drm-kmod/Makefile.common
--- a/graphics/nvidia-drm-kmod/Makefile.common
+++ b/graphics/nvidia-drm-kmod/Makefile.common
@@ -146,6 +146,9 @@
.if ${NVVERSION} >= 620.00000
${REINPLACE_CMD} -e 's/%llu\ /%lu\ /' ${WRKSRC}/nvidia-drm-connector.c
.endif
+ # don't add `machine` to the search path for stdarg.h as it is deprecated
+ ${REINPLACE_CMD} -e '/-Imachine/d' \
+ ${WRKSRC}/Makefile
# Workaround for build failure on graphics/nvidia-drm-515-kmod*,
# as struct dma_buf_map was renamed to struct iosys_map at Linux 5.18 (DRM5.18).
.if ${.CURDIR:M*nvidia-drm-515-kmod*}
diff --git a/x11/nvidia-kmod/Makefile b/x11/nvidia-kmod/Makefile
--- a/x11/nvidia-kmod/Makefile
+++ b/x11/nvidia-kmod/Makefile
@@ -244,6 +244,23 @@
-e 's/DMAP_MAX_ADDRESS/kva_layout.dmap_high/' \
${WRKSRC}/src/${NVSRC}/nvidia_subr.c
.endif
+# machine/stdarg.h is deprecated, use sys/stdarg.h.
+ ${REINPLACE_CMD} -e '/machine\/stdarg.h/d' \
+ ${WRKSRC}/src/${NVSRC}/Makefile
+.if ${NVVERSION:R} >= 390
+ ${REINPLACE_CMD} -e 's|<stdarg.h>|<sys/stdarg.h>|' \
+ ${WRKSRC}/src/common/inc/nv_stdarg.h
+.else
+ ${REINPLACE_CMD} -e 's|<stdarg.h>|<sys/stdarg.h>|' \
+ ${WRKSRC}/src/${NVSRC}/nv.h
+ ${REINPLACE_CMD} -e 's|<stdarg.h>|<sys/stdarg.h>|' \
+ ${WRKSRC}/src/${NVSRC}/os-interface.h
+.endif
+# don't add `machine` to the search path for stdarg.h as it is deprecated
+.if ${NVVERSION:R} >= 390
+ ${REINPLACE_CMD} -e 's/-Imachine//' \
+ ${WRKSRC}/src/nvidia-modeset/Makefile
+.endif
post-install: .SILENT
# pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 12, 2:07 AM (5 h, 27 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41669475
Default Alt Text
D61415.1794449224.diff (1 KB)

Event Timeline