Link dri drivers with mesa or dricore libtool library
Now mesa/drivers/dri is converted to automake, we want to update DRI_LIB_DEPS so that we link with the libmesa or libdricore libtool library, as appropriate. However, this is complicated by the fact that gallium/targets is not (yet) converted, so we can't share the DRI_LIB_DEPS autoconf variable with that anymore. Add an additional autoconf variable GALLIUM_DRI_LIB_DEPS, which is now used in gallium/targets/Makefile.dri, to link with the libdircore or libmesa native library. v2: libdricore$VERSION.a needs to be libdricore$(VERSION).a Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Eric Anholt <eric@anholt.net> Tested-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
parent
cf362d00b9
commit
defadf2b15
|
@ -148,6 +148,7 @@ GLAPI_LIB_DEPS = $(EXTRA_LIB_PATH) @GLAPI_LIB_DEPS@
|
||||||
|
|
||||||
# DRI dependencies
|
# DRI dependencies
|
||||||
DRI_LIB_DEPS = $(EXTRA_LIB_PATH) @DRI_LIB_DEPS@
|
DRI_LIB_DEPS = $(EXTRA_LIB_PATH) @DRI_LIB_DEPS@
|
||||||
|
GALLIUM_DRI_LIB_DEPS = $(EXTRA_LIB_PATH) @GALLIUM_DRI_LIB_DEPS@
|
||||||
LIBDRM_CFLAGS = @LIBDRM_CFLAGS@
|
LIBDRM_CFLAGS = @LIBDRM_CFLAGS@
|
||||||
LIBDRM_LIB = @LIBDRM_LIBS@
|
LIBDRM_LIB = @LIBDRM_LIBS@
|
||||||
DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
|
DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
|
||||||
|
|
11
configure.ac
11
configure.ac
|
@ -1065,11 +1065,14 @@ GLAPI_LIB_DEPS="-lpthread $SELINUX_LIBS"
|
||||||
AC_SUBST([GLAPI_LIB_DEPS])
|
AC_SUBST([GLAPI_LIB_DEPS])
|
||||||
|
|
||||||
|
|
||||||
dnl Setup default DRI CFLAGS
|
dnl dri libraries are linking with mesa
|
||||||
DRI_LIB_DEPS='$(TOP)/src/mesa/libmesa.a'
|
DRI_LIB_DEPS='$(TOP)/src/mesa/libmesa.la'
|
||||||
|
GALLIUM_DRI_LIB_DEPS='$(TOP)/src/mesa/libmesa.a'
|
||||||
|
|
||||||
|
dnl ... or dricore?
|
||||||
if test "x$enable_dri" = xyes && test "x$driglx_direct" = xyes ; then
|
if test "x$enable_dri" = xyes && test "x$driglx_direct" = xyes ; then
|
||||||
DRI_LIB_DEPS="-L\$(TOP)/\$(LIB_DIR) -ldricore$VERSION"
|
DRI_LIB_DEPS='$(TOP)/src/mesa/libdricore/libdricore$(VERSION).la'
|
||||||
|
GALLIUM_DRI_LIB_DEPS='$(TOP)/src/mesa/libdricore/libdricore$(VERSION).a'
|
||||||
HAVE_DRICORE=yes
|
HAVE_DRICORE=yes
|
||||||
fi
|
fi
|
||||||
AM_CONDITIONAL(HAVE_DRICORE, test x$HAVE_DRICORE = xyes)
|
AM_CONDITIONAL(HAVE_DRICORE, test x$HAVE_DRICORE = xyes)
|
||||||
|
@ -1247,10 +1250,12 @@ if test "x$enable_dri" = xyes; then
|
||||||
|
|
||||||
# put all the necessary libs together
|
# put all the necessary libs together
|
||||||
DRI_LIB_DEPS="$DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread $DLOPEN_LIBS"
|
DRI_LIB_DEPS="$DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread $DLOPEN_LIBS"
|
||||||
|
GALLIUM_DRI_LIB_DEPS="$GALLIUM_DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread $DLOPEN_LIBS"
|
||||||
fi
|
fi
|
||||||
AC_SUBST([DRI_DIRS])
|
AC_SUBST([DRI_DIRS])
|
||||||
AC_SUBST([EXPAT_INCLUDES])
|
AC_SUBST([EXPAT_INCLUDES])
|
||||||
AC_SUBST([DRI_LIB_DEPS])
|
AC_SUBST([DRI_LIB_DEPS])
|
||||||
|
AC_SUBST([GALLIUM_DRI_LIB_DEPS])
|
||||||
|
|
||||||
case $DRI_DIRS in
|
case $DRI_DIRS in
|
||||||
*i915*|*i965*)
|
*i915*|*i965*)
|
||||||
|
|
|
@ -73,8 +73,8 @@ $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) Makefile \
|
||||||
$(MKLIB) -o $@.tmp -noprefix -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
|
$(MKLIB) -o $@.tmp -noprefix -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
|
||||||
$(OBJECTS) $(PIPE_DRIVERS) \
|
$(OBJECTS) $(PIPE_DRIVERS) \
|
||||||
-Wl,--start-group $(MESA_MODULES) -Wl,--end-group \
|
-Wl,--start-group $(MESA_MODULES) -Wl,--end-group \
|
||||||
$(DRI_LIB_DEPS) $(DRIVER_EXTRAS)
|
$(GALLIUM_DRI_LIB_DEPS) $(DRIVER_EXTRAS)
|
||||||
$(CXX) $(CFLAGS) -o $@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $@.tmp $(DRI_LIB_DEPS) $(LDFLAGS);
|
$(CXX) $(CFLAGS) -o $@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $@.tmp $(GALLIUM_DRI_LIB_DEPS) $(LDFLAGS);
|
||||||
@rm -f $@.test
|
@rm -f $@.test
|
||||||
mv -f $@.tmp $@
|
mv -f $@.tmp $@
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue