fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 00:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix linking gallium drivers and with dricore after defadf2b1

Browse source 
Commit defadf2b1 erroneously tries to make gallium drivers link with libdricore
as a static library, not a shared library

Also, change uses of DRI_LIB_DEPS in gallium driver Makefiles to
GALLIUM_DRI_LIB_DEPS, so the libraries added are used in the linking the gallium
driver

Also, fix the path to the libdricore.so symlink, it's made in LIB_DIR, not in
the libdricore directory

Also repair quoting of dricore settings of DRI_LIB_DEPS and GALLIUM_DRI_LIB_DEPS
variables so VERSION is interpolated in configure but TOP and LIB_DIR are
interpolated later (where they are known, but VERSION isn't)

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Tom Stellard <thomas.stellard@amd.com>
This commit is contained in:
Jon TURNEY 2012-07-13 15:14:43 +01:00
parent 9ed65301e0
commit 39d82a1b20
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -1066,8 +1066,8 @@ GALLIUM_DRI_LIB_DEPS='$(TOP)/src/mesa/libmesa.a'
dnl ... or dricore?
if test "x$enable_dri" = xyes && test "x$driglx_direct" = xyes ; then
DRI_LIB_DEPS='$(TOP)/src/mesa/libdricore/libdricore$(VERSION).la'
GALLIUM_DRI_LIB_DEPS='$(TOP)/src/mesa/libdricore/libdricore$(VERSION).a'
DRI_LIB_DEPS="\$(TOP)/src/mesa/libdricore/libdricore${VERSION}.la"
GALLIUM_DRI_LIB_DEPS="\$(TOP)/\$(LIB_DIR)/libdricore${VERSION}.so"
HAVE_DRICORE=yes
fi
AM_CONDITIONAL(HAVE_DRICORE, test x$HAVE_DRICORE = xyes)

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

@ -28,6 +28,6 @@ endif
include ../Makefile.dri
DRI_LIB_DEPS += -ldrm_intel
GALLIUM_DRI_LIB_DEPS += -ldrm_intel
symlinks:

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

@ -23,6 +23,6 @@ DRIVER_DEFINES = \
include ../Makefile.dri
DRI_LIB_DEPS += $(shell $(PKG_CONFIG) libdrm_nouveau --libs)
GALLIUM_DRI_LIB_DEPS += $(shell $(PKG_CONFIG) libdrm_nouveau --libs)
symlinks:

2
src/gallium/targets/dri-r300/Makefile
View file

@ -21,6 +21,6 @@ DRIVER_DEFINES = \
include ../Makefile.dri
DRI_LIB_DEPS += -ldrm_radeon
GALLIUM_DRI_LIB_DEPS += -ldrm_radeon
symlinks:

2
src/gallium/targets/dri-r600/Makefile
View file

@ -21,6 +21,6 @@ DRIVER_DEFINES = \
include ../Makefile.dri
DRI_LIB_DEPS += -ldrm_radeon
GALLIUM_DRI_LIB_DEPS += -ldrm_radeon
symlinks:

2
src/gallium/targets/dri-radeonsi/Makefile
View file

@ -21,6 +21,6 @@ DRIVER_DEFINES = \
include ../Makefile.dri
DRI_LIB_DEPS += -ldrm_radeon
GALLIUM_DRI_LIB_DEPS += -ldrm_radeon
symlinks: