fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-09 03:20:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

targets/dri: move linker flags out of configure into Automake.inc

Browse source 
Previous assumption was that the same set of flags can be reused
for both classic and gallium drivers. With megadriver work done
the classic drivers ended up using their own (single) instance of
the flags.

Move these into Automake.inc and rename to indicate that those
are gallium specific. Additionally silence an automake/autoconf
warning "XXX is not a standard libtool library name", due to
the parsing issues of the module tag.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
Emil Velikov 2013-11-09 23:00:14 +00:00
parent 5b8c2c8f00
commit 02fdb5cb51
11 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -1050,7 +1050,6 @@ if test "x$enable_dri" = xyes; then
DRI_LIB_DEPS="$DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIBS -lm $PTHREAD_LIBS $DLOPEN_LIBS"
GALLIUM_DRI_LIB_DEPS="$GALLIUM_DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIBS -lm $CLOCK_LIB $PTHREAD_LIBS $DLOPEN_LIBS"
DRI_DRIVER_LDFLAGS="-module -avoid-version -shared -Wl,-Bsymbolic"
fi
AM_CONDITIONAL(NEED_MEGADRIVER, test -n "$DRI_DIRS")
@ -1058,7 +1057,6 @@ AM_CONDITIONAL(NEED_LIBMESA, test "x$enable_xlib_glx" = xyes -o \
"x$enable_osmesa" = xyes -o \
-n "$DRI_DIRS")
AC_SUBST([DRI_LIB_DEPS])
AC_SUBST([DRI_DRIVER_LDFLAGS])
AC_SUBST([GALLIUM_DRI_LIB_DEPS])
case $DRI_DIRS in

8
src/gallium/Automake.inc
View file

@ -50,6 +50,14 @@ GALLIUM_VIDEO_CFLAGS = \
$(LIBDRM_CFLAGS) \
$(VISIBILITY_CFLAGS)
# TODO: add -export-symbols-regex
GALLIUM_DRI_LINKER_FLAGS = \
-module \
-avoid-version \
-shared \
-Wl,-Bsymbolic
GALLIUM_VDPAU_LINKER_FLAGS = \
-module \
-version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \

2
src/gallium/targets/dri-freedreno/Makefile.am
View file

@ -32,7 +32,7 @@ AM_CPPFLAGS = \
dridir = $(DRI_DRIVER_INSTALL_DIR)
dri_LTLIBRARIES = kgsl_dri.la msm_dri.la
COMMON_LDFLAGS = $(DRI_DRIVER_LDFLAGS)
COMMON_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS)
COMMON_LIBADD = \
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \

2
src/gallium/targets/dri-i915/Makefile.am
View file

@ -35,7 +35,7 @@ dri_LTLIBRARIES = i915_dri.la
i915_dri_la_SOURCES = target.c
i915_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS)
i915_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS)
i915_dri_la_LIBADD = \
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \

2
src/gallium/targets/dri-ilo/Makefile.am
View file

@ -35,7 +35,7 @@ noinst_LTLIBRARIES = ilo_dri.la
ilo_dri_la_SOURCES = target.c
# need -rpath to create a noinst shared library
ilo_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS) \
ilo_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS) \
-rpath $(abs_builddir)
ilo_dri_la_LIBADD = \

2
src/gallium/targets/dri-nouveau/Makefile.am
View file

@ -34,7 +34,7 @@ dri_LTLIBRARIES = nouveau_dri.la
nodist_EXTRA_nouveau_dri_la_SOURCES = dummy.cpp
nouveau_dri_la_SOURCES = target.c
nouveau_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS)
nouveau_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS)
nouveau_dri_la_LIBADD = \
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \

2
src/gallium/targets/dri-swrast/Makefile.am
View file

@ -42,7 +42,7 @@ swrast_dri_la_SOURCES = \
$(top_srcdir)/src/mesa/drivers/dri/common/dri_util.c \
$(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c
swrast_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS)
swrast_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS)
swrast_dri_la_LIBADD = \
$(top_builddir)/src/mesa/libmesagallium.la \

2
src/gallium/targets/dri-vmwgfx/Makefile.am
View file

@ -35,7 +35,7 @@ vmwgfx_dri_la_SOURCES = \
target.c \
vmw_powf.c
vmwgfx_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS)
vmwgfx_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS)
vmwgfx_dri_la_LIBADD = \
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \

2
src/gallium/targets/r300/dri/Makefile.am
View file

@ -36,7 +36,7 @@ nodist_EXTRA_r300_dri_la_SOURCES = dummy.cpp
r300_dri_la_SOURCES = \
drm_target.c
r300_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS)
r300_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS)
r300_dri_la_LIBADD = \
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \

2
src/gallium/targets/r600/dri/Makefile.am
View file

@ -35,7 +35,7 @@ dri_LTLIBRARIES = r600_dri.la
r600_dri_la_SOURCES = \
drm_target.c
r600_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS)
r600_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS)
r600_dri_la_LIBADD = \
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \

2
src/gallium/targets/radeonsi/dri/Makefile.am
View file

@ -36,7 +36,7 @@ nodist_EXTRA_radeonsi_dri_la_SOURCES = dummy.cpp
radeonsi_dri_la_SOURCES = \
drm_target.c
radeonsi_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS)
radeonsi_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS)
radeonsi_dri_la_LIBADD = \
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \