Source-Changes-HG archive

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

[src/trunk]: src/sys/external/bsd/drm2/radeon Fix radeon include order.



details:   https://anonhg.NetBSD.org/src/rev/79e6b6335d7a
branches:  trunk
changeset: 992464:79e6b6335d7a
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 06:39:51 2018 +0000

description:
Fix radeon include order.

diffstat:

 sys/external/bsd/drm2/radeon/files.radeon |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r b12fcfa7ba57 -r 79e6b6335d7a sys/external/bsd/drm2/radeon/files.radeon
--- a/sys/external/bsd/drm2/radeon/files.radeon Mon Aug 27 06:39:38 2018 +0000
+++ b/sys/external/bsd/drm2/radeon/files.radeon Mon Aug 27 06:39:51 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.radeon,v 1.16 2018/08/27 06:32:44 riastradh Exp $
+#      $NetBSD: files.radeon,v 1.17 2018/08/27 06:39:51 riastradh Exp $
 
 define radeonfbbus     { }
 device radeon: drmkms, drmkms_pci, drmkms_ttm, radeonfbbus, firmload
@@ -8,11 +8,14 @@
 device radeondrmkmsfb: radeonfbbus, genfb, wsemuldisplaydev
 attach radeondrmkmsfb at radeonfbbus
 
-makeoptions    radeon  CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/radeon"
-makeoptions    radeon  CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/amd/include"
+# Our overrides first.
 makeoptions    radeon  CPPFLAGS+="-I$S/external/bsd/drm2/include/radeon"
 makeoptions    radeon  CPPFLAGS+="-I$S/external/bsd/drm2/radeon"
 
+# Then their header files.
+makeoptions    radeon  CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/amd/include"
+makeoptions    radeon  CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/radeon"
+
 makeoptions    radeon  "CWARNFLAGS.radeon"+="-Wno-missing-field-initializers"
 makeoptions    radeon  "CWARNFLAGS.radeon"+="-Wno-missing-prototypes"
 makeoptions    radeon  "CWARNFLAGS.radeon"+="-Wno-shadow"



Home | Main Index | Thread Index | Old Index