[Mesa-dev] [PATCH 02/13] mesa/dri: always link against shared glapi

[Grazvydas Ignotas]

This causes a strange build failure for me:

make[7]: Entering directory '/home/notaz/src/radeon/mesa/src/mesa/drivers/dri'
make[7]: Nothing to be done for 'install-exec-am'.
 /bin/mkdir -p '/opt/xorg/lib/dri/'
 /bin/bash ../../../../libtool   --mode=install /usr/bin/install -c
mesa_dri_drivers.la '/opt/xorg/lib/dri/'
libtool:   error: error: cannot install 'mesa_dri_drivers.la' to a
directory not ending in /opt/xorg/lib/dri/
Makefile:651: recipe for target 'install-driLTLIBRARIES' failed

And no it's not a missed "make clean" that google might suggest, I've
long learned to use "git clean -fdx" before building mesa...

Gražvydas


On Fri, Apr 28, 2017 at 4:14 PM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
>
> Analogous to previous commit. Check with the extensive commit
> description and bug report referenced.
>
> Cc: mesa-stable at lists.freedesktop.org
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
>  src/mesa/drivers/dri/Makefile.am | 16 +++++++++-------
>  1 file changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am
> index 1c6dd08a85d..fb0fc3258bf 100644
> --- a/src/mesa/drivers/dri/Makefile.am
> +++ b/src/mesa/drivers/dri/Makefile.am
> @@ -6,12 +6,9 @@ MEGADRIVERS_DEPS =
>
>  SUBDIRS+=common
>
> -# On Android, we need to explicitly link to libglapi.so.
> -if HAVE_ANDROID
>  if HAVE_SHARED_GLAPI
>  SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
>  endif
> -endif
>
>  if HAVE_I915_DRI
>  SUBDIRS += i915
> @@ -59,10 +56,15 @@ driinclude_HEADERS = \
>  nodist_EXTRA_mesa_dri_drivers_la_SOURCES = dummy.cpp
>  mesa_dri_drivers_la_SOURCES =
>  mesa_dri_drivers_la_LDFLAGS = \
> -        -module -avoid-version -shared -shrext .so \
> -        $(BSYMBOLIC) \
> -        $(GC_SECTIONS) \
> -        $()
> +       -shared \
> +       -shrext .so \
> +       -module \
> +       -no-undefined \
> +       -avoid-version \
> +       $(BSYMBOLIC) \
> +       $(GC_SECTIONS) \
> +       $(LD_NO_UNDEFINED)
> +
>  mesa_dri_drivers_la_LIBADD = \
>          ../../libmesa.la \
>          common/libmegadriver_stub.la \
> --
> 2.12.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev