From: Emil Velikov <emil.veli...@collabora.com>

A while back Michel reported that LLVM has symbol versioning to avoid
symbol collisions. Based on observations LLVM 5.0 is the first upstream
version to actually has it.

The Debian/Ubuntu packaging has local patches for that, going back to
LLVM 3.7.

Since symbol collisions do come up again and again (fortunately not so
often) let's flip the switch back to static.

The toggle is still there for those interested in linking to the shared
version of the library.

Cc: mesa-sta...@lists.freedesktop.org
Cc: Michel Dänzer <michel.daen...@amd.com>
Cc: Tom Stellard <tstel...@redhat.com>
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
---
 Makefile.am  | 2 +-
 configure.ac | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a4f49d3d332..ea0ab627e58 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,7 +40,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \
        --enable-vdpau \
        --enable-xa \
        --enable-xvmc \
-       --enable-llvm-shared-libs \
+       --disable-llvm-shared-libs \
        --enable-libunwind \
        --with-platforms=x11,wayland,drm,surfaceless \
        --with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast \
diff --git a/configure.ac b/configure.ac
index df8cfa6b71b..934d5b0d3c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -917,9 +917,9 @@ dnl LLVM
 dnl
 AC_ARG_ENABLE([llvm-shared-libs],
     [AS_HELP_STRING([--enable-llvm-shared-libs],
-        [link with LLVM shared libraries @<:@default=enabled@:>@])],
+        [link with LLVM shared libraries @<:@default=disabled@:>@])],
     [enable_llvm_shared_libs="$enableval"],
-    [enable_llvm_shared_libs=yes])
+    [enable_llvm_shared_libs=no])
 
 AC_ARG_WITH([llvm-prefix],
     [AS_HELP_STRING([--with-llvm-prefix],
-- 
2.14.1

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to