[src/trunk]: src/sys/external/bsd/drm2 Revert part of previous: no separate C...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/973766ab4b94
branches:  trunk
changeset: 1028390:973766ab4b94
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 10:55:37 2021 +0000

description:
Revert part of previous: no separate CPPFLAGS.drmkms.

There are too many drms users outside sys/external/bsd/drm2 for now;
will hold off on this until we find a better way to keep the drm
includes modularized.

diffstat:

 sys/external/bsd/drm2/drm/files.drmkms         |  48 ++++++++++++-------------
 sys/external/bsd/drm2/i915drm/files.i915drmkms |   4 +-
 sys/external/bsd/drm2/nouveau/files.nouveau    |   3 +-
 sys/external/bsd/drm2/pci/files.drmkms_pci     |   5 +--
 sys/external/bsd/drm2/radeon/files.radeon      |   3 +-
 sys/external/bsd/drm2/ttm/files.ttm            |   4 +-
 6 files changed, 28 insertions(+), 39 deletions(-)

diffs (178 lines):

diff -r 3b1542bf2312 -r 973766ab4b94 sys/external/bsd/drm2/drm/files.drmkms
--- a/sys/external/bsd/drm2/drm/files.drmkms    Sun Dec 19 10:55:27 2021 +0000
+++ b/sys/external/bsd/drm2/drm/files.drmkms    Sun Dec 19 10:55:37 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.drmkms,v 1.63 2021/12/19 10:55:27 riastradh Exp $
+#      $NetBSD: files.drmkms,v 1.64 2021/12/19 10:55:37 riastradh Exp $
 
 version        20180827
 
@@ -17,38 +17,38 @@
 makeoptions    drmkms  "COPTS.drmkms"+="-fwrapv"
 
 # Overrides first.
-makeoptions    drmkms  "CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/include"
-makeoptions    drmkms  "CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/include/drm"
+makeoptions    drmkms  CPPFLAGS+="-I$S/external/bsd/drm2/include"
+makeoptions    drmkms  CPPFLAGS+="-I$S/external/bsd/drm2/include/drm"
 
-makeoptions    drmkms  "CPPFLAGS.drmkms"+="-I$S/external/bsd/common/include"
+makeoptions    drmkms  CPPFLAGS+="-I$S/external/bsd/common/include"
 
 # Then upstream.
-makeoptions    drmkms  "CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/dist/include"
-makeoptions    drmkms  "CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/dist/include/drm"
-makeoptions    drmkms  "CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/dist/include/uapi"
+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/include/uapi"
 
-makeoptions    drmkms  "CPPFLAGS.drmkms"+="-D__KERNEL__"
+makeoptions    drmkms  CPPFLAGS+="-D__KERNEL__"
 
 ifdef i386
-makeoptions    drmkms  "CPPFLAGS.drmkms"+="-DCONFIG_X86"
-makeoptions    drmkms  "CPPFLAGS.drmkms"+="-DCONFIG_X86_PAT"
+makeoptions    drmkms  CPPFLAGS+="-DCONFIG_X86"
+makeoptions    drmkms  CPPFLAGS+="-DCONFIG_X86_PAT"
 elifdef amd64
-makeoptions    drmkms  "CPPFLAGS.drmkms"+="-DCONFIG_X86"
-makeoptions    drmkms  "CPPFLAGS.drmkms"+="-DCONFIG_X86_64"
-makeoptions    drmkms  "CPPFLAGS.drmkms"+="-DCONFIG_X86_PAT"
+makeoptions    drmkms  CPPFLAGS+="-DCONFIG_X86"
+makeoptions    drmkms  CPPFLAGS+="-DCONFIG_X86_64"
+makeoptions    drmkms  CPPFLAGS+="-DCONFIG_X86_PAT"
 elifdef arm
-makeoptions    drmkms  "CPPFLAGS.drmkms"+="-DCONFIG_ARM"
+makeoptions    drmkms  CPPFLAGS+="-DCONFIG_ARM"
 elifdef aarch64
-makeoptions    drmkms  "CPPFLAGS.drmkms"+="-DCONFIG_AARCH64"
+makeoptions    drmkms  CPPFLAGS+="-DCONFIG_AARCH64"
 endif
 
-makeoptions    drmkms  "CPPFLAGS.drmkms"+="-DCONFIG_BACKLIGHT_CLASS_DEVICE=0"
-makeoptions    drmkms  "CPPFLAGS.drmkms"+="-DCONFIG_BACKLIGHT_CLASS_DEVICE_MODULE=0"
-makeoptions    drmkms  "CPPFLAGS.drmkms"+="-DCONFIG_DRM_FBDEV_EMULATION=1"
-makeoptions    drmkms  "CPPFLAGS.drmkms"+="-DCONFIG_DRM_FBDEV_OVERALLOC=100"
-makeoptions    drmkms  "CPPFLAGS.drmkms"+="-DCONFIG_FB=0"
-makeoptions    drmkms  "CPPFLAGS.drmkms"+="-DCONFIG_LOCKDEP=0"
-makeoptions    drmkms  "CPPFLAGS.drmkms"+="-DCONFIG_PCI=1"
+makeoptions    drmkms  CPPFLAGS+="-DCONFIG_BACKLIGHT_CLASS_DEVICE=0"
+makeoptions    drmkms  CPPFLAGS+="-DCONFIG_BACKLIGHT_CLASS_DEVICE_MODULE=0"
+makeoptions    drmkms  CPPFLAGS+="-DCONFIG_DRM_FBDEV_EMULATION=1"
+makeoptions    drmkms  CPPFLAGS+="-DCONFIG_DRM_FBDEV_OVERALLOC=100"
+makeoptions    drmkms  CPPFLAGS+="-DCONFIG_FB=0"
+makeoptions    drmkms  CPPFLAGS+="-DCONFIG_LOCKDEP=0"
+makeoptions    drmkms  CPPFLAGS+="-DCONFIG_PCI=1"
 
 makeoptions    drmkms  "CWARNFLAGS.drmkms"+="-Wno-missing-field-initializers"
 
@@ -63,7 +63,6 @@
 # Generic, unaccelerated kms framebuffer.
 define drmfb: genfb
 file   external/bsd/drm2/drm/drmfb.c                   drmfb
-makeoptions    drmfb   "CPPFLAGS.drmfb"+="${CPPFLAGS.drmkms}"
 
 include "external/bsd/drm2/ttm/files.ttm"
 
@@ -81,8 +80,7 @@
 
 # Legacy user-mode setting
 define drmums: drmkms
-makeoptions    drmums  "CPPFLAGS.drmkms"+="-DCONFIG_DRM_LEGACY"
-makeoptions    drmums  "CPPFLAGS.drmums"+="-DCONFIG_DRM_LEGACY"
+makeoptions    drmums  CPPFLAGS+="-DCONFIG_DRM_LEGACY"
 file   external/bsd/drm2/dist/drm/drm_bufs.c           drmums
 file   external/bsd/drm2/dist/drm/drm_context.c        drmums
 file   external/bsd/drm2/dist/drm/drm_dma.c            drmums
diff -r 3b1542bf2312 -r 973766ab4b94 sys/external/bsd/drm2/i915drm/files.i915drmkms
--- a/sys/external/bsd/drm2/i915drm/files.i915drmkms    Sun Dec 19 10:55:27 2021 +0000
+++ b/sys/external/bsd/drm2/i915drm/files.i915drmkms    Sun Dec 19 10:55:37 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.i915drmkms,v 1.57 2021/12/19 10:55:27 riastradh Exp $
+#      $NetBSD: files.i915drmkms,v 1.58 2021/12/19 10:55:37 riastradh Exp $
 
 version        20180827
 
@@ -13,8 +13,6 @@
 # overflow is OK.
 makeoptions    i915drmkms      "COPTS.i915drmkms"+="-fwrapv"
 
-makeoptions    i915drmkms      "CPPFLAGS.i915drmkms"+="${CPPFLAGS.drmkms}"
-
 makeoptions    i915drmkms      "CPPFLAGS.i915drmkms"+="-I$S/external/bsd/drm2/i915drm"
 
 makeoptions    i915drmkms      "CPPFLAGS.i915drmkms"+="-I$S/external/bsd/drm2/dist/drm/i915"
diff -r 3b1542bf2312 -r 973766ab4b94 sys/external/bsd/drm2/nouveau/files.nouveau
--- a/sys/external/bsd/drm2/nouveau/files.nouveau       Sun Dec 19 10:55:27 2021 +0000
+++ b/sys/external/bsd/drm2/nouveau/files.nouveau       Sun Dec 19 10:55:37 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.nouveau,v 1.35 2021/12/19 10:55:27 riastradh Exp $
+#      $NetBSD: files.nouveau,v 1.36 2021/12/19 10:55:37 riastradh Exp $
 
 version        20180827
 
@@ -21,7 +21,6 @@
 # overflow is OK.
 makeoptions    nouveau "COPTS.nouveau"+="-fwrapv"
 
-makeoptions    nouveau "CPPFLAGS.nouveau"+="${CPPFLAGS.drmkms}"
 makeoptions    nouveau "CPPFLAGS.nouveau"+="-I$S/external/bsd/drm2/dist/drm/nouveau"
 makeoptions    nouveau "CPPFLAGS.nouveau"+="-I$S/external/bsd/drm2/dist/drm/nouveau/include"
 makeoptions    nouveau "CPPFLAGS.nouveau"+="-I$S/external/bsd/drm2/dist/drm/nouveau/include/nvkm"
diff -r 3b1542bf2312 -r 973766ab4b94 sys/external/bsd/drm2/pci/files.drmkms_pci
--- a/sys/external/bsd/drm2/pci/files.drmkms_pci        Sun Dec 19 10:55:27 2021 +0000
+++ b/sys/external/bsd/drm2/pci/files.drmkms_pci        Sun Dec 19 10:55:37 2021 +0000
@@ -1,16 +1,13 @@
-#      $NetBSD: files.drmkms_pci,v 1.14 2021/12/19 10:55:27 riastradh Exp $
+#      $NetBSD: files.drmkms_pci,v 1.15 2021/12/19 10:55:37 riastradh Exp $
 
 define drmkms_pci: drmkms
 
-makeoptions    drmkms_pci      "CPPFLAGS.drmkms_pci"+="${CPPFLAGS.drmkms}"
-
 #file  external/bsd/drm2/dist/drm/ati_pcigart.c        drmkms_pci
 file   external/bsd/drm2/dist/drm/drm_agpsupport.c     drmkms_pci & agp
 file   external/bsd/drm2/pci/drm_pci.c                 drmkms_pci
 file   external/bsd/drm2/pci/drm_pci_module.c          drmkms_pci
 
 define drmfb_pci: drmfb, drmkms_pci
-makeoptions    drmfb_pci       "CPPFLAGS.drmfb_pci"+="${CPPFLAGS.drmkms_pci}"
 file   external/bsd/drm2/pci/drmfb_pci.c               drmfb_pci
 
 include "external/bsd/drm2/amdgpu/files.amdgpu"
diff -r 3b1542bf2312 -r 973766ab4b94 sys/external/bsd/drm2/radeon/files.radeon
--- a/sys/external/bsd/drm2/radeon/files.radeon Sun Dec 19 10:55:27 2021 +0000
+++ b/sys/external/bsd/drm2/radeon/files.radeon Sun Dec 19 10:55:37 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.radeon,v 1.34 2021/12/19 10:55:27 riastradh Exp $
+#      $NetBSD: files.radeon,v 1.35 2021/12/19 10:55:37 riastradh Exp $
 
 version        20180827
 
@@ -14,7 +14,6 @@
 # overflow is OK.
 makeoptions    radeon  "COPTS.radeon"+="-fwrapv"
 
-makeoptions    radeon  "CPPFLAGS.radeon"+="${CPPFLAGS.drmkms}"
 makeoptions    radeondrmkmsfb  "CPPFLAGS.radeondrmkmsfb"+="${CPPFLAGS.radeon}"
 
 # Our overrides first.
diff -r 3b1542bf2312 -r 973766ab4b94 sys/external/bsd/drm2/ttm/files.ttm
--- a/sys/external/bsd/drm2/ttm/files.ttm       Sun Dec 19 10:55:27 2021 +0000
+++ b/sys/external/bsd/drm2/ttm/files.ttm       Sun Dec 19 10:55:37 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.ttm,v 1.6 2021/12/19 10:55:27 riastradh Exp $
+#      $NetBSD: files.ttm,v 1.7 2021/12/19 10:55:38 riastradh Exp $
 
 # TTM, the texture and tiling manager.
 
@@ -6,8 +6,6 @@
 
 define drmkms_ttm: drmkms
 
-makeoptions    drmkms_ttm      "CPPFLAGS.drmkms_ttm"+="${CPPFLAGS.drmkms}"
-
 makeoptions    drmkms  "CWARNFLAGS.ttm_bo.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} >= 7:? -Wno-error=implicit-fallthrough :}"
 makeoptions    drmkms_ttm      "CPPFLAGS.drmkms_ttm"+="-DCONFIG_AGP=1"
 makeoptions    drmkms_ttm      "CWARNFLAGS.drmkms_ttm"+="-Wno-missing-field-initializers"