[Mesa-dev] [PATCH v4] automake: intel: move expat handling where it's used

[Eric Engestrom]

On Wednesday, 2017-10-18 10:50:09 +0000, Lionel Landwerlin wrote:
> If you feel like it, you could also fix the meson build :)
> Otherwise, this is :
> 
> Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>

Just pushed both :)

Thanks Hongxu, and welcome to Mesa!

> 
> On 18/10/17 02:47, Hongxu Jia wrote:
> > Linking libvulkan_intel.so can fail, due to unresolved references to
> > libexpat.so.
> > 
> > EXPAT_CFLAGS should be moved as well.
> > 
> > Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
> > ---
> >   src/intel/Makefile.common.am | 3 ++-
> >   src/intel/Makefile.tools.am  | 4 ----
> >   2 files changed, 2 insertions(+), 5 deletions(-)
> > 
> > diff --git a/src/intel/Makefile.common.am b/src/intel/Makefile.common.am
> > index 49e9c6a..894dbb5 100644
> > --- a/src/intel/Makefile.common.am
> > +++ b/src/intel/Makefile.common.am
> > @@ -21,8 +21,9 @@
> >   noinst_LTLIBRARIES += common/libintel_common.la
> > -common_libintel_common_la_CFLAGS = $(AM_CFLAGS) $(LIBDRM_CFLAGS)
> > +common_libintel_common_la_CFLAGS = $(AM_CFLAGS) $(LIBDRM_CFLAGS) $(EXPAT_CFLAGS)
> >   common_libintel_common_la_SOURCES = $(COMMON_FILES)
> > +common_libintel_common_la_LIBADD = $(EXPAT_LIBS)
> >   if HAVE_PLATFORM_ANDROID
> >   common_libintel_common_la_CFLAGS += $(ANDROID_CFLAGS)
> > diff --git a/src/intel/Makefile.tools.am b/src/intel/Makefile.tools.am
> > index 8071220..af8cd5b 100644
> > --- a/src/intel/Makefile.tools.am
> > +++ b/src/intel/Makefile.tools.am
> > @@ -31,7 +31,6 @@ tools_aubinator_SOURCES = \
> >   tools_aubinator_CFLAGS = \
> >   	$(AM_CFLAGS) \
> > -	$(EXPAT_CFLAGS) \
> >   	$(ZLIB_CFLAGS)
> >   tools_aubinator_LDADD = \
> > @@ -41,7 +40,6 @@ tools_aubinator_LDADD = \
> >   	$(PER_GEN_LIBS) \
> >   	$(PTHREAD_LIBS) \
> >   	$(DLOPEN_LIBS) \
> > -	$(EXPAT_LIBS) \
> >   	$(ZLIB_LIBS) \
> >   	-lm
> > @@ -56,10 +54,8 @@ tools_aubinator_error_decode_LDADD = \
> >   	compiler/libintel_compiler.la \
> >   	$(top_builddir)/src/util/libmesautil.la \
> >   	$(PTHREAD_LIBS) \
> > -	$(EXPAT_LIBS) \
> >   	$(ZLIB_LIBS)
> >   tools_aubinator_error_decode_CFLAGS = \
> >   	$(AM_CFLAGS) \
> > -	$(EXPAT_CFLAGS) \
> >   	$(ZLIB_CFLAGS)
> 
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev