[Mesa-dev] [PATCH v2] Makefile.tools.am/Makefile.common.am: move handling of Expat to Makefile.common.am

[Emil Velikov]

Hi Hongxu,

The one line message is unreadable, I'm afraid. How about;
automake: intel: move expat handling where it's used

On 12 October 2017 at 02:39, Hongxu Jia <hongxu.jia at windriver.com> wrote:
> While built with "-fvisibility=default"
> ...
> |i586-oe-linux-gcc ... -fvisibility=default ... -o common/.libs/common_libintel_common_la-gen_decoder.o
> ...
>
> It triggered the failure
> ...
> |i586-oe-linux-g++  ... common/.libs/libintel_common.a ... -o vulkan/.libs/libvulkan_intel.so
> |common/.libs/libintel_common.a(common_libintel_common_la-gen_decoder.o):
> |In function `start_element':
> |/usr/src/debug/mesa/2_17.1.7-r0/mesa-17.1.7/src/intel/common/gen_decoder.c:371:
> undefined reference to `XML_GetCurrentLineNumber'
> ...
>
I think you can swap the above, with something shorter alike:

Linking libvulkan_intel.so can fail, due to unresolved references to
libexpat.so.

> Expat is used in src/intel/common/, thus we should move the handling
> of Expat to Makefile.common.am.
>
> Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
> ---
>  src/intel/Makefile.common.am | 1 +
>  src/intel/Makefile.tools.am  | 2 --
>  2 files changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/src/intel/Makefile.common.am b/src/intel/Makefile.common.am
> index 49e9c6a..3789dc1 100644
> --- a/src/intel/Makefile.common.am
> +++ b/src/intel/Makefile.common.am
> @@ -23,6 +23,7 @@ noinst_LTLIBRARIES += common/libintel_common.la
>
>  common_libintel_common_la_CFLAGS = $(AM_CFLAGS) $(LIBDRM_CFLAGS)
EXPAT_CFLAGS should be moved as well.

With the above:

Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
Fixes: 7d84bb32aa6 ("intel: Move tools/decoder.[ch] to
common/gen_decoder.[ch].")

Thanks
Emil