File u_respect_cflags.diff of Package intel-gpu-tools
From: Jan Engelhardt <jengelh@inai.de> Date: 2017-02-05 13:15:36.359677297 +0100 Subject: build: resolve build error due to improper CFLAGS 1. intel-gpu-tools failed to use LIBKMOD_CFLAGS, which can lead to build errors if libkmod is in a non-default location. 2. CFLAGS obtained from pkg-config are really CPPFLAGS and should go there (AM_CPPFLAGS). 3. The target-specific CFLAGS overrides are unnecessary, since there are no conflicting settings obtained from pkg-config. --- tests/Makefile.am | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) Index: intel-gpu-tools-1.22/tests/Makefile.am =================================================================== --- intel-gpu-tools-1.22.orig/tests/Makefile.am +++ intel-gpu-tools-1.22/tests/Makefile.am @@ -84,15 +84,17 @@ EXTRA_DIST = \ CLEANFILES = $(EXTRA_PROGRAMS) test-list.txt test-list-full.txt .gitignore -AM_CFLAGS = $(CWARNFLAGS) -Wno-unused-result $(DEBUG_CFLAGS)\ - -I$(top_srcdir)/include/drm-uapi \ +AM_CPPFLAGS = -I$(top_srcdir)/include/drm-uapi \ -I$(srcdir)/.. \ -I$(srcdir)/../lib \ -include "$(srcdir)/../lib/check-ndebug.h" \ + $(CAIRO_CFLAGS) $(DRM_CFLAGS) $(DRM_NOUVEAU_CFLAGS) $(DRM_VC4_CFLAGS) \ + $(GLIB_CFLAGS) $(KMOD_CFLAGS) $(LIBUDEV_CFLAGS) $(LIBUNWIND_CFLAGS) \ -DIGT_SRCDIR=\""$(abs_srcdir)"\" \ -DIGT_DATADIR=\""$(pkgdatadir)"\" \ - -D_GNU_SOURCE \ - $(DRM_CFLAGS) $(LIBUNWIND_CFLAGS) $(WERROR_CFLAGS) \ + -D_GNU_SOURCE +AM_CFLAGS = $(CWARNFLAGS) -Wno-unused-result $(DEBUG_CFLAGS)\ + $(WERROR_CFLAGS) \ $(NULL) LDADD = ../lib/libintel_tools.la $(XMLRPC_LIBS) @@ -134,11 +136,8 @@ gem_wait_LDADD = $(LDADD) -lrt kms_flip_LDADD = $(LDADD) -lrt -lpthread pm_rc6_residency_LDADD = $(LDADD) -lrt -prime_nv_test_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS) prime_nv_test_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS) -prime_nv_api_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS) prime_nv_api_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS) -prime_nv_pcopy_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS) prime_nv_pcopy_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS) kms_chamelium_CFLAGS = $(AM_CFLAGS) $(XMLRPC_CFLAGS) $(LIBUDEV_CFLAGS)
