From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
To: Eric Anholt <eric@anholt.net>, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH i-g-t 2/5] tests: Convert to using the imported drm-uapi headers.
Date: Sat, 11 Nov 2017 00:18:56 +0000 [thread overview]
Message-ID: <07bae070-0666-7b5a-2dcc-e8fc4ece268d@intel.com> (raw)
In-Reply-To: <20171110212618.904-3-eric@anholt.net>
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 <eric@anholt.net>
> ---
> 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 += \
> $(NULL)
> endif
>
> -AM_CPPFLAGS = -I$(top_srcdir)
> +AM_CPPFLAGS = \
> + -I$(top_srcdir)/include/drm-uapi \
> + -I$(top_srcdir)
> +
> AM_CFLAGS = \
> $(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
>
> -inc = include_directories('lib', '.')
> +inc = include_directories('include/drm-uapi', 'lib', '.')
>
> config = configuration_data()
>
> 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 = \
> CLEANFILES = $(EXTRA_PROGRAMS) test-list.txt test-list-full.txt .gitignore
>
> AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) -Wno-unused-result $(DEBUG_CFLAGS)\
> + -I$(top_srcdir)/include/drm-uapi \
That seems to put include/drm-uapi after $(DRM_CFLAGS) which probably
means you're picking up the system headers first.
I guess you want to have it the other way?
> -I$(srcdir)/.. \
> -I$(srcdir)/../lib \
> -include "$(srcdir)/../lib/check-ndebug.h" \
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-11-11 0:18 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-10 21:26 [PATCH i-g-t 0/5] Import drm UAPI headers Eric Anholt
2017-11-10 21:26 ` [PATCH i-g-t 1/5] headers: Import drm-next uapi headers Eric Anholt
2017-11-10 21:26 ` [PATCH i-g-t 2/5] tests: Convert to using the imported drm-uapi headers Eric Anholt
2017-11-11 0:18 ` Lionel Landwerlin [this message]
2017-11-13 20:59 ` Eric Anholt
2017-11-10 21:26 ` [PATCH i-g-t 3/5] tests: Remove libdrm_vc4 dependency Eric Anholt
2017-11-22 10:37 ` Petri Latvala
2017-11-10 21:26 ` [PATCH i-g-t 4/5] lib: Use the imported uapi's addfb2 defines Eric Anholt
2017-11-10 21:26 ` [PATCH i-g-t 5/5] lib: Use drm-uapi/i915_drm.h instead of local defines Eric Anholt
2017-11-10 21:44 ` ✓ Fi.CI.BAT: success for Import drm UAPI headers Patchwork
2017-11-10 23:04 ` ✗ Fi.CI.IGT: warning " Patchwork
2017-11-11 0:27 ` [PATCH i-g-t 0/5] " Lionel Landwerlin
2017-11-13 11:40 ` Petri Latvala
2017-11-20 10:41 ` Daniel Vetter
2017-11-20 20:06 ` Eric Anholt
2017-11-21 9:05 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=07bae070-0666-7b5a-2dcc-e8fc4ece268d@intel.com \
--to=lionel.g.landwerlin@intel.com \
--cc=eric@anholt.net \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox