Package: csound / 1:6.08.0~dfsg-1

debian-specific/lua-link.diff Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
From: Felipe Sateler <fsateler@gmail.com>
Date: Mon, 30 Nov 2015 10:02:13 -0300
Subject: Only link to lua when necessary, and to the correct lib

Lua policy recommends not linking against the lua library, because it
doesn't help at all. All lua-using programs will load the library, not
the modules.
TODO: The csound-lua bridge is not implemented in cmake yet.
The csound-lua bridge, on the other hand, needs to link to the library or
else it will fail to load. Use the correct library name.
---
 frontends/CsoundAC/CMakeLists.txt | 4 ++--
 interfaces/CMakeLists.txt         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontends/CsoundAC/CMakeLists.txt b/frontends/CsoundAC/CMakeLists.txt
index 3ff5647..2405327 100644
--- a/frontends/CsoundAC/CMakeLists.txt
+++ b/frontends/CsoundAC/CMakeLists.txt
@@ -155,10 +155,10 @@ if(BUILD_CSOUND_AC)
             PROPERTIES CPLUSPLUS ON
             SWIG_MODULE_NAME luaCsoundAC)
         SWIG_ADD_MODULE(luaCsoundAC lua luaCsoundAC.i)
-        SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd6 ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY} ${LUAJIT_LIBRARY})
+        SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd6 ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY})
 
         if(MUSICXML_LIBRARY)
-          SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd6 ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY} ${MUSICXML_LIBRARY} ${LUAJIT_LIBRARY})
+          SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd6 ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY} ${MUSICXML_LIBRARY})
         endif()
 
 
diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
index 83c0864..54d71dc 100644
--- a/interfaces/CMakeLists.txt
+++ b/interfaces/CMakeLists.txt
@@ -183,7 +183,7 @@ if(BUILD_PYTHON_INTERFACE OR BUILD_JAVA_INTERFACE OR BUILD_LUA_INTERFACE)
     endif()
 
     if(BUILD_LUA_INTERFACE)
-        set(swiglua_LIBS ${LUAJIT_LIBRARY} ${CSOUNDLIB} libcsnd6)
+        set(swiglua_LIBS ${CSOUNDLIB} libcsnd6)
 
         SET_SOURCE_FILES_PROPERTIES(lua_interface.i
             PROPERTIES CPLUSPLUS ON