From 711f20a469e31ba8fe8d1474969855825dab834c Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 2 Mar 2020 20:03:26 +0100 Subject: [PATCH] Exclude zita-convolver from being available as external lib Ardour statically links libardour against zita-convolver, this is required because it's used in plugins and available by Lua scripts. libzita-convolver has been modified to be in a custom namespace and extern global symbols have been removed. On most GNU/Linux distros system-wide default zita-convolver is not compatible nor suitable to be used as-is. --- libs/zita-convolver/wscript | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/libs/zita-convolver/wscript b/libs/zita-convolver/wscript index 5a75c028f5..3bde65575c 100644 --- a/libs/zita-convolver/wscript +++ b/libs/zita-convolver/wscript @@ -29,17 +29,11 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - if conf.is_defined('USE_EXTERNAL_LIBS'): - autowaf.check_pkg(conf, 'zita-convolver', uselib_store='LIBZCONVOLVER', atleast_version=ZCONVOLVER_LIB_VERSION, mandatory=True) - else: - conf.load ('compiler_cxx') - autowaf.configure(conf) - autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', mandatory=True) + conf.load ('compiler_cxx') + autowaf.configure(conf) + autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', mandatory=True) def build(bld): - if bld.is_defined('USE_EXTERNAL_LIBS'): - return - obj = bld.stlib(features = 'cxx cxxstlib', source = 'zita-convolver.cc') obj.cxxflags = [ '-fPIC', '-O3', '-ffast-math', '-funroll-loops' ] obj.export_includes = ['.']