Module Name: src
Committed By: riastradh
Date: Mon Aug 27 06:37:41 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/drm: files.drmkms
Log Message:
Reorder header files to avoid drm_legacy.h lossage.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/external/bsd/drm2/drm/files.drmkms
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/drm/files.drmkms
diff -u src/sys/external/bsd/drm2/drm/files.drmkms:1.20 src/sys/external/bsd/drm2/drm/files.drmkms:1.21
--- src/sys/external/bsd/drm2/drm/files.drmkms:1.20 Mon Aug 27 06:33:08 2018
+++ src/sys/external/bsd/drm2/drm/files.drmkms Mon Aug 27 06:37:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.drmkms,v 1.20 2018/08/27 06:33:08 riastradh Exp $
+# $NetBSD: files.drmkms,v 1.21 2018/08/27 06:37:41 riastradh Exp $
include "external/bsd/drm2/linux/files.drmkms_linux"
@@ -13,11 +13,16 @@ define drmkms: drmkms_linux, drmkms_i2c,
defflag opt_drmkms.h DRMKMS_DEBUG
makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/include"
makeoptions drmkms_ttm CPPFLAGS+="-I$S/external/bsd/drm2/include/drm"
-makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist"
+makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/common/include"
makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist/include"
makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist/include/drm"
makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist/uapi"
-makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/common/include"
+
+# Must come last because some header file names are repeated in
+# dist/drm (I'm looking ta you, drm_legacy.h), while others sometimes
+# explicitly write <uapi/...>. (Maybe that should have been imported
+# under dist/include/uapi rather than dist/uapi.)
+makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist"
makeoptions drmkms "CWARNFLAGS.drm_crtc.c"+="-Wno-shadow"
makeoptions drmkms "CWARNFLAGS.drm_crtc.c"+="-Wno-missing-field-initializers"
