From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Anholt Subject: Re: [PATCH i-g-t 2/5] tests: Convert to using the imported drm-uapi headers. Date: Mon, 13 Nov 2017 12:59:59 -0800 Message-ID: <87shdhnbcg.fsf@anholt.net> References: <20171110212618.904-1-eric@anholt.net> <20171110212618.904-3-eric@anholt.net> <07bae070-0666-7b5a-2dcc-e8fc4ece268d@intel.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0239606337==" Return-path: Received: from anholt.net (anholt.net [50.246.234.109]) by gabe.freedesktop.org (Postfix) with ESMTP id 124D36E117 for ; Mon, 13 Nov 2017 21:00:02 +0000 (UTC) In-Reply-To: <07bae070-0666-7b5a-2dcc-e8fc4ece268d@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Lionel Landwerlin , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org --===============0239606337== Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Lionel Landwerlin writes: > On 10/11/17 21:26, Eric Anholt wrote: >> Tested by dropping garbage in my libdrm's headers and rebuilding. >> >> Signed-off-by: Eric Anholt >> --- >> lib/Makefile.am | 5 ++++- >> meson.build | 2 +- >> tests/Makefile.am | 1 + >> 3 files changed, 6 insertions(+), 2 deletions(-) >> >> diff --git a/lib/Makefile.am b/lib/Makefile.am >> index 30ddb92bd0bc..7b3d87780db9 100644 >> --- a/lib/Makefile.am >> +++ b/lib/Makefile.am >> @@ -46,7 +46,10 @@ lib_source_list +=3D \ >> $(NULL) >> endif >>=20=20=20 >> -AM_CPPFLAGS =3D -I$(top_srcdir) >> +AM_CPPFLAGS =3D \ >> + -I$(top_srcdir)/include/drm-uapi \ >> + -I$(top_srcdir) >> + >> AM_CFLAGS =3D \ >> $(CWARNFLAGS) \ >> $(DRM_CFLAGS) \ >> diff --git a/meson.build b/meson.build >> index fb81c4dbbd55..b14617a5f5d0 100644 >> --- a/meson.build >> +++ b/meson.build >> @@ -26,7 +26,7 @@ foreach cc_arg : cc_args >> endif >> endforeach >>=20=20=20 >> -inc =3D include_directories('lib', '.') >> +inc =3D include_directories('include/drm-uapi', 'lib', '.') >>=20=20=20 >> config =3D configuration_data() >>=20=20=20 >> diff --git a/tests/Makefile.am b/tests/Makefile.am >> index 89a970153992..ba5acefa68b4 100644 >> --- a/tests/Makefile.am >> +++ b/tests/Makefile.am >> @@ -85,6 +85,7 @@ EXTRA_DIST =3D \ >> CLEANFILES =3D $(EXTRA_PROGRAMS) test-list.txt test-list-full.txt .git= ignore >>=20=20=20 >> AM_CFLAGS =3D $(DRM_CFLAGS) $(CWARNFLAGS) -Wno-unused-result $(DEBUG_C= FLAGS)\ >> + -I$(top_srcdir)/include/drm-uapi \ > > That seems to put include/drm-uapi after $(DRM_CFLAGS) which probably=20 > means you're picking up the system headers first. > I guess you want to have it the other way? Oh, that had accidentally ended up in patch 5. Thanks! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEE/JuuFDWp9/ZkuCBXtdYpNtH8nugFAloKB88ACgkQtdYpNtH8 nugohBAAty0eORupzQg2gGhIZfJ/7TVyZRs8qzbpZGTGvl3fFAbJ7wNHk5N9+rAA 7YbRdQGbyadfev63clwKoxHoTsgYo+ij87QzWoUg/VZLDJEH8TzhCyloOlE7lTU9 21agyj/4QA1TrO+AQOHTxS2MRjfRLUXpYU1eCCcTufElz/kzzf70BFiHyfBioPe1 G9sLBrLrXepY7ZhH4aNXSyg2a33KLbrfHS5BrmHO+mFCIw/qJ9laRC5wTCSNbEOj wq4CkBGS1QvU6B2kg4vmSdB85y9vzHBfMRVv2KbG8oiIHDbN9hSC8Z+e+wzNr/EC X6PQgDD51fyolP8H2z3xL5bv5/LytawiQXzPoRCWAbG0zzoIjH+0yJZVn51kcU46 OWx3Pdahj3pFGUsvtX3IEK9uux50xlMwOi4ZNgjgBYxGDAn75ansLpS1DofXNFVO S4zFFR2/IikrCcTPOn5IIJnJJclMfeAz+czkWyUF1fR9/6HLi8/cxtxB5WmNu10L AXh3rjyoviFp85wi2vdRsv+Lcj+WxBSAtiT6KyZ7e3/1SfR0QK7+h8aad3gn19W6 8DKoiL+TatpLEu/ZzbCBnhnICxqC6Rae9HvokOJK9YgisjZ+kffrt1Y2l2HVDaZi UxyrJIbIB5ll661aWeJtjza8JlWJG2Xja4ATEr05WnGOHH+14dg= =zwtP -----END PGP SIGNATURE----- --=-=-=-- --===============0239606337== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== --===============0239606337==--