build: force .so extension for the gallium dri modules

While linux uses .so as a default extension for shared libraries that is
not the case for other platforms. The loader in libGL (and others) assumes
that the dri module will always have a .so extension, thus it will fail
to load on the affected platforms.

Spotted-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

diff --git a/install-gallium-links.mk b/install-gallium-links.mk
index 6ed8a24a707013440c8adfbf0906c6887913bcf3..757b28870bc042d36803bff017337d5861224091 100644 (file)
--- a/install-gallium-links.mk
+++ b/install-gallium-links.mk
@@ -12,7 +12,7 @@ all-local : .libs/install-gallium-links
                link_dir=$(top_builddir)/$(LIB_DIR)/egl;        \
        fi;                                                     \
        $(MKDIR_P) $$link_dir;                                  \
-       file_list=$(dri_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*);  \
+       file_list=$(dri_LTLIBRARIES:%.la=.libs/%.so);           \
        file_list+=$(vdpau_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*); \
        file_list+=$(egl_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*); \
        file_list+=$(lib_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*); \

diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index bafde36c6b0f3de9072c5d2640a27bdcaa5f2940..1f5d532e42645681f2dd1bab0649d151642e8ff5 100644 (file)
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -55,6 +55,7 @@ DRI_VERSION_SCRIPT ?= $(top_srcdir)/src/gallium/state_trackers/dri/dri.link
 
 GALLIUM_DRI_LINKER_FLAGS = \
        -shared \
+       -shrext .so \
        -module \
        -avoid-version \
        $(GC_SECTIONS) \