audacia
/
audacia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libvamp: Fix linkage against dl for hostsdk library. 

src/vamp-hostsdk/PluginLoader.cpp uses the dlopen function. On some platforms
you have to link against dl for this function. configure checks for dlopen
and adds -ldl to LIBS if you have to link against dl. We need to pass this
LIBS variable when linking the hostsdk library.
This commit is contained in:
benjamin.drung@gmail.com 2013-11-18 14:26:44 +00:00
parent 53e0aca508
commit da736f9f44
3 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib-src/audacity-patches.txt
View File

@ -126,7 +126,7 @@ libvamp
-------
Library to load and use VAMP plug-ins. http://www.vamp-plugins.org/
Version in Audacity SVN: 2.5
Patches: none
Patches: fix-linkage-against-dl.patch: Fix linkage against dl for hostsdk library.
Upstream Version: 2.5
libvorbis

6
lib-src/libvamp/Makefile.in
View File

@ -61,6 +61,10 @@ PLUGIN_EXT = .so
#
HOST_LIBS = ./libvamp-hostsdk.a @SNDFILE_LIBS@ @LIBS@
# Libraries required for the host.
#
HOSTSDK_LIBS = @LIBS@
# Libraries required for the RDF template generator.
#
RDFGEN_LIBS = ./libvamp-hostsdk.a @LIBS@
@ -239,7 +243,7 @@ $(SDK_DYNAMIC): $(SDK_OBJECTS) $(API_HEADERS) $(SDK_HEADERS)
$(CXX) $(LDFLAGS) $(SDK_DYNAMIC_LDFLAGS) -o $@ $(SDK_OBJECTS)
$(HOSTSDK_DYNAMIC): $(HOSTSDK_OBJECTS) $(API_HEADERS) $(HOSTSDK_HEADERS)
$(CXX) $(LDFLAGS) $(HOSTSDK_DYNAMIC_LDFLAGS) -o $@ $(HOSTSDK_OBJECTS)
$(CXX) $(LDFLAGS) $(HOSTSDK_DYNAMIC_LDFLAGS) -o $@ $(HOSTSDK_OBJECTS) $(HOSTSDK_LIBS)
$(PLUGIN_TARGET): $(PLUGIN_OBJECTS) $(SDK_STATIC) $(PLUGIN_HEADERS)
$(CXX) $(LDFLAGS) $(PLUGIN_LDFLAGS) -o $@ $(PLUGIN_OBJECTS) $(PLUGIN_LIBS)

30
lib-src/libvamp/fix-linkage-against-dl.patch Normal file
View File

@ -0,0 +1,30 @@
Description: Fix linkage against dl for hostsdk library.
src/vamp-hostsdk/PluginLoader.cpp uses the dlopen function. On some platforms
you have to link against dl for this function. configure checks for dlopen
and adds -ldl to LIBS if you have to link against dl. We need to pass this
LIBS variable when linking the hostsdk library.
Index: Makefile.in
===================================================================
--- Makefile.in (revision 12949)
+++ Makefile.in (working copy)
@@ -61,6 +61,10 @@
#
HOST_LIBS = ./libvamp-hostsdk.a @SNDFILE_LIBS@ @LIBS@
+# Libraries required for the host.
+#
+HOSTSDK_LIBS = @LIBS@
+
# Libraries required for the RDF template generator.
#
RDFGEN_LIBS = ./libvamp-hostsdk.a @LIBS@
@@ -239,7 +243,7 @@
$(CXX) $(LDFLAGS) $(SDK_DYNAMIC_LDFLAGS) -o $@ $(SDK_OBJECTS)
$(HOSTSDK_DYNAMIC): $(HOSTSDK_OBJECTS) $(API_HEADERS) $(HOSTSDK_HEADERS)
- $(CXX) $(LDFLAGS) $(HOSTSDK_DYNAMIC_LDFLAGS) -o $@ $(HOSTSDK_OBJECTS)
+ $(CXX) $(LDFLAGS) $(HOSTSDK_DYNAMIC_LDFLAGS) -o $@ $(HOSTSDK_OBJECTS) $(HOSTSDK_LIBS)
$(PLUGIN_TARGET): $(PLUGIN_OBJECTS) $(SDK_STATIC) $(PLUGIN_HEADERS)
$(CXX) $(LDFLAGS) $(PLUGIN_LDFLAGS) -o $@ $(PLUGIN_OBJECTS) $(PLUGIN_LIBS)