summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cowgill <jcowgill@debian.org>2019-07-15 23:46:33 +0100
committerJames Cowgill <jcowgill@debian.org>2019-07-15 23:46:33 +0100
commit4b5141755ecdfbe561471fa98ad85f46cc54ccbd (patch)
treedd2147020f08cfce06141b260278b38895e78355
parentd66e1e91c9ed8b969e2ae9c91b25086f2b87f214 (diff)
Add symbol versions to the libmodplug compat library
Forwarded: no This should ensure there are no symbol collisions if both the original libmodplug and our libopenmpt-modplug libraries are loaded at the same time. Forwarded: no Gbp-Pq: Name 01_libmodplug_symver.patch
-rw-r--r--Makefile.am2
-rw-r--r--libmodplug/libmodplug.ver8
2 files changed, 9 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index f199bc2..dc4f9ea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -395,7 +395,7 @@ libopenmpt_la_SOURCES += libopenmpt/libopenmpt_version.h
if ENABLE_LIBOPENMPT_MODPLUG
lib_LTLIBRARIES += libopenmpt_modplug.la
-libopenmpt_modplug_la_LDFLAGS = -version-info 1:0:0 -no-undefined
+libopenmpt_modplug_la_LDFLAGS = -version-info 1:0:0 -no-undefined -Wl,--version-script=libmodplug/libmodplug.ver
libopenmpt_modplug_la_CPPFLAGS = $(MINGWSTDTHREADS_CPPFLAGS) -I$(srcdir)/
libopenmpt_modplug_la_CXXFLAGS =
libopenmpt_modplug_la_CFLAGS =
diff --git a/libmodplug/libmodplug.ver b/libmodplug/libmodplug.ver
new file mode 100644
index 0000000..eb0a17e
--- /dev/null
+++ b/libmodplug/libmodplug.ver
@@ -0,0 +1,8 @@
+LIBOPENMPT_MODPLUG1 {
+global:
+ ModPlug_*;
+ _ZN10CSoundFile*;
+ _ZNK10CSoundFile*;
+local:
+ *;
+};