[Mesa-dev] [PATCH] Fix linking gallium drivers and with dricore after defadf2b1 (v2)

[Kristian Høgsberg]

On Fri, Jul 13, 2012 at 12:18 PM, Tom Stellard <thomas.stellard at amd.com> wrote:
> On Fri, Jul 13, 2012 at 05:05:05PM +0100, Jon TURNEY wrote:
>> 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 symlink, it's made in LIB_DIR, not
>> in the libdricore directory
>>
>> Also repair quoting of dricore settings of *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)
>>
>
> Just tested and this fixes the build, please commit ASAP.
>
>> Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
>
>   Signed-off-by: Tom Stellard <thomas.stellard at amd.com>

Me too, that is, please commit and

Tested-by: Kristian Høgsberg <krh at bitplanet.net>

>> ---
>>  configure.ac                              |    4 ++--
>>  src/gallium/targets/dri-i915/Makefile     |    2 +-
>>  src/gallium/targets/dri-nouveau/Makefile  |    2 +-
>>  src/gallium/targets/dri-r300/Makefile     |    2 +-
>>  src/gallium/targets/dri-r600/Makefile     |    2 +-
>>  src/gallium/targets/dri-radeonsi/Makefile |    2 +-
>>  6 files changed, 7 insertions(+), 7 deletions(-)
>>
>> diff --git a/configure.ac b/configure.ac
>> index 00a1d5d..8ddb7b7 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -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)
>> diff --git a/src/gallium/targets/dri-i915/Makefile b/src/gallium/targets/dri-i915/Makefile
>> index 2ba3eb6..ddebff2 100644
>> --- a/src/gallium/targets/dri-i915/Makefile
>> +++ b/src/gallium/targets/dri-i915/Makefile
>> @@ -28,6 +28,6 @@ endif
>>
>>  include ../Makefile.dri
>>
>> -DRI_LIB_DEPS += -ldrm_intel
>> +GALLIUM_DRI_LIB_DEPS += -ldrm_intel
>>
>>  symlinks:
>> diff --git a/src/gallium/targets/dri-nouveau/Makefile b/src/gallium/targets/dri-nouveau/Makefile
>> index c3c2778..25e6aea 100644
>> --- a/src/gallium/targets/dri-nouveau/Makefile
>> +++ b/src/gallium/targets/dri-nouveau/Makefile
>> @@ -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:
>> diff --git a/src/gallium/targets/dri-r300/Makefile b/src/gallium/targets/dri-r300/Makefile
>> index 6a8bf66..256aa23 100644
>> --- a/src/gallium/targets/dri-r300/Makefile
>> +++ b/src/gallium/targets/dri-r300/Makefile
>> @@ -21,6 +21,6 @@ DRIVER_DEFINES = \
>>
>>  include ../Makefile.dri
>>
>> -DRI_LIB_DEPS += -ldrm_radeon
>> +GALLIUM_DRI_LIB_DEPS += -ldrm_radeon
>>
>>  symlinks:
>> diff --git a/src/gallium/targets/dri-r600/Makefile b/src/gallium/targets/dri-r600/Makefile
>> index 9cc9cb9..7402750 100644
>> --- a/src/gallium/targets/dri-r600/Makefile
>> +++ b/src/gallium/targets/dri-r600/Makefile
>> @@ -21,6 +21,6 @@ DRIVER_DEFINES = \
>>
>>  include ../Makefile.dri
>>
>> -DRI_LIB_DEPS += -ldrm_radeon
>> +GALLIUM_DRI_LIB_DEPS += -ldrm_radeon
>>
>>  symlinks:
>> diff --git a/src/gallium/targets/dri-radeonsi/Makefile b/src/gallium/targets/dri-radeonsi/Makefile
>> index f76d71b..b45f243 100644
>> --- a/src/gallium/targets/dri-radeonsi/Makefile
>> +++ b/src/gallium/targets/dri-radeonsi/Makefile
>> @@ -21,6 +21,6 @@ DRIVER_DEFINES = \
>>
>>  include ../Makefile.dri
>>
>> -DRI_LIB_DEPS += -ldrm_radeon
>> +GALLIUM_DRI_LIB_DEPS += -ldrm_radeon
>>
>>  symlinks:
>> --
>> 1.7.9
>>
>> _______________________________________________
>> mesa-dev mailing list
>> mesa-dev at lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>>
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev