diff options
| author | Emil Velikov <[email protected]> | 2014-04-07 15:24:46 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-04-09 22:12:36 +0100 |
| commit | 55f9bbd46c7cd021dd1d208071d1a79bc423eda8 (patch) | |
| tree | f6eb68560e315a7dc442d998333afcb4e521cd59 | |
| parent | 92d0786f881a0b65ade503c85401a074350af27a (diff) | |
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 <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
| -rw-r--r-- | install-gallium-links.mk | 2 | ||||
| -rw-r--r-- | src/gallium/Automake.inc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/install-gallium-links.mk b/install-gallium-links.mk index 6ed8a24a707..757b28870bc 100644 --- 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 bafde36c6b0..1f5d532e426 100644 --- 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) \ |