From: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed, 9 Apr 2014 20:07:06 +0000 (+0100)
Subject: Partially revert bba9c28 "configure: use LIB_EXT rather than hardcoded .so"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=92d0786f881a0b65ade503c85401a074350af27a;p=mesa.git

Partially revert bba9c28 "configure: use LIB_EXT rather than hardcoded .so"

Filenames passed to dlopen() don't need to use the platform's default extension
for shared libraries.

Using the '.so' extension when dlopen()ing DRI drivers is hardcoded into mesa
and the X server, so it should be hardcoded here in the Makefile as well.

A similar fix is probably also needed for gallium DRI drivers.

(Consider that if we were starting from scratch, perhaps we would use a custom
extension like .dri instead)

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

diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am
index f1fee122cb7..e8076120d94 100644
--- a/src/mesa/drivers/dri/Makefile.am
+++ b/src/mesa/drivers/dri/Makefile.am
@@ -9,37 +9,37 @@ SUBDIRS+=common
 if HAVE_I915_DRI
 SUBDIRS += i915
 MEGADRIVERS_DEPS += i915/libi915_dri.la
-MEGADRIVERS += i915_dri.@LIB_EXT@
+MEGADRIVERS += i915_dri.so
 endif
 
 if HAVE_I965_DRI
 SUBDIRS += i965
 MEGADRIVERS_DEPS += i965/libi965_dri.la
-MEGADRIVERS += i965_dri.@LIB_EXT@
+MEGADRIVERS += i965_dri.so
 endif
 
 if HAVE_NOUVEAU_DRI
 SUBDIRS += nouveau
 MEGADRIVERS_DEPS += nouveau/libnouveau_dri.la
-MEGADRIVERS += nouveau_vieux_dri.@LIB_EXT@
+MEGADRIVERS += nouveau_vieux_dri.so
 endif
 
 if HAVE_R200_DRI
 SUBDIRS += r200
 MEGADRIVERS_DEPS += r200/libr200_dri.la
-MEGADRIVERS += r200_dri.@LIB_EXT@
+MEGADRIVERS += r200_dri.so
 endif
 
 if HAVE_RADEON_DRI
 SUBDIRS += radeon
 MEGADRIVERS_DEPS += radeon/libradeon_dri.la
-MEGADRIVERS += radeon_dri.@LIB_EXT@
+MEGADRIVERS += radeon_dri.so
 endif
 
 if HAVE_SWRAST_DRI
 SUBDIRS += swrast
 MEGADRIVERS_DEPS += swrast/libswrast_dri.la
-MEGADRIVERS += swrast_dri.@LIB_EXT@
+MEGADRIVERS += swrast_dri.so
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -51,7 +51,7 @@ driinclude_HEADERS = $(top_srcdir)/include/GL/internal/dri_interface.h
 nodist_EXTRA_mesa_dri_drivers_la_SOURCES = dummy.cpp
 mesa_dri_drivers_la_SOURCES =
 mesa_dri_drivers_la_LDFLAGS = \
-        -module -avoid-version -shared \
+        -module -avoid-version -shared -shrext .so \
         -Wl,-Bsymbolic \
         $(GC_SECTIONS) \
         $()
@@ -70,22 +70,22 @@ if HAVE_COMPAT_SYMLINKS
 # Add a link to allow setting LD_LIBRARY_PATH/LIBGL_DRIVERS_PATH to /lib of the build tree.
 all-local: mesa_dri_drivers.la
 	$(AM_V_at)$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
-	$(AM_V_GEN)ln -f .libs/mesa_dri_drivers.@LIB_EXT@ \
-			 $(top_builddir)/$(LIB_DIR)/mesa_dri_drivers.@LIB_EXT@;
+	$(AM_V_GEN)ln -f .libs/mesa_dri_drivers.so \
+			 $(top_builddir)/$(LIB_DIR)/mesa_dri_drivers.so;
 	$(AM_V_GEN)for i in $(MEGADRIVERS); do \
-		ln -f $(top_builddir)/$(LIB_DIR)/mesa_dri_drivers.@LIB_EXT@ \
+		ln -f $(top_builddir)/$(LIB_DIR)/mesa_dri_drivers.so \
 		      $(top_builddir)/$(LIB_DIR)/$$i; \
 	done;
 endif
 
 # hardlink each megadriver instance, but don't actually have
-# mesa_dri_drivers.@LIB_EXT@ in the set of final installed files.
+# mesa_dri_drivers.so in the set of final installed files.
 install-data-hook:
 	for i in $(MEGADRIVERS); do \
-		ln -f $(DESTDIR)$(dridir)/mesa_dri_drivers.@LIB_EXT@ \
+		ln -f $(DESTDIR)$(dridir)/mesa_dri_drivers.so \
 		      $(DESTDIR)$(dridir)/$$i; \
 	done;
-	$(RM) -f $(DESTDIR)$(dridir)/mesa_dri_drivers.@LIB_EXT@
+	$(RM) -f $(DESTDIR)$(dridir)/mesa_dri_drivers.so
 	$(RM) -f $(DESTDIR)$(dridir)/mesa_dri_drivers.la
 
 endif