[Bug 294870] graphics/drm-66-kmod, graphics/drm-61-kmod: Fails to build on stable/15 after commit ports d94082fc799f

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=294870

--- Comment #9 from Tomoaki AOKI <[email protected]> ---
Does below look correct?

The offending option seems to be existing from LLVM/Clang 4.0.0,
so lower the value to compare to be 40.
And for graphics/drm-66-kmod only, already-existed part of patch
graphics/drm-66-kmod/files/patch-i915_Makefile used 210000 to compare with
${COMPILER_VERSION}, which looks unsane.

I've tried adding example: target at the end of ${WRKSRC}/i915/Makefile that
simply echos ${COMPILER_VERSION}, and `make example` at ${WRKSRC}/i915/Makefile
showed 191 for me (stable/15 at commit base
f60defbd2bcb6212294a783958f7884faa8b2b34).
So fixed the value to 210.


  ===== diff below =====

diff --git a/graphics/drm-61-kmod/files/patch-i915_Makefile
b/graphics/drm-61-kmod/files/patch-i915_Makefile
new file mode 100644
index 000000000000..2ad23a72c764
--- /dev/null
+++ b/graphics/drm-61-kmod/files/patch-i915_Makefile
@@ -0,0 +1,11 @@
+--- i915/Makefile.orig 2026-04-29 07:48:52 UTC
++++ i915/Makefile
+@@ -330,7 +330,7 @@ CWARNFLAGS += -Wno-pointer-arith -Wno-format -Wno-cast
+ # error: cast from 'const unsigned long *' to 'volatile unsigned long *'
+ CWARNFLAGS += -Wno-pointer-arith -Wno-format -Wno-cast-qual
+ 
+-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 211
++.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 40
+ CWARNFLAGS += -Wno-address-of-packed-member
+ .endif
+ 
diff --git a/graphics/drm-66-kmod/files/patch-i915_Makefile
b/graphics/drm-66-kmod/files/patch-i915_Makefile
index 51111ea15121..8cb546b9cfa5 100644
--- a/graphics/drm-66-kmod/files/patch-i915_Makefile
+++ b/graphics/drm-66-kmod/files/patch-i915_Makefile
@@ -1,12 +1,16 @@
 --- i915/Makefile.orig 2025-12-11 14:11:14 UTC
 +++ i915/Makefile
-@@ -360,6 +360,9 @@ CWARNFLAGS += -Wno-pointer-arith -Wno-format -Wno-cast
+@@ -360,9 +360,12 @@ CWARNFLAGS += -Wno-pointer-arith -Wno-format -Wno-cast
  # Reason: More or less all files need it due to use of test_bit() macro
  # error: cast from 'const unsigned long *' to 'volatile unsigned long *'
  CWARNFLAGS += -Wno-pointer-arith -Wno-format -Wno-cast-qual
-+.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 210000
++.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 210
 +CWARNFLAGS += -Wno-default-const-init-var-unsafe
 +.endif

+-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 211
++.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 40
+ CWARNFLAGS += -Wno-address-of-packed-member
+ .endif
+ 
  CWARNFLAGS.intel_acpi.c=      -Wno-incompatible-pointer-types
- CWARNFLAGS.intel_audio.c=     -Wno-unused-function

-- 
You are receiving this mail because:
You are the assignee for the bug.