From 8bb91099c5b1ce73be0c5c2b53392dba1d5a6fdb Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Sat, 22 Jan 2022 22:09:13 +0100 Subject: [PATCH] wscript: drop configure statements already present in the top level wscript Avoid repeated pointless configure messages like: Checking for 'g++' (C++ compiler!) : /usr/lib64/ccache/g++ Checking for 'gcc' (C compiler) : /usr/lib64/ccache/gcc --- gtk2_ardour/wscript | 2 -- headless/wscript | 2 -- libs/appleutility/wscript | 1 - libs/ardour/wscript | 2 -- libs/ardouralsautil/wscript | 1 - libs/audiographer/wscript | 2 -- libs/auscan/wscript | 3 +-- libs/backends/alsa/wscript | 2 +- libs/backends/coreaudio/wscript | 1 - libs/backends/dummy/wscript | 2 +- libs/backends/jack/wscript | 1 - libs/backends/portaudio/wscript | 1 - libs/backends/pulseaudio/wscript | 2 +- libs/backends/wscript | 1 - libs/canvas/wscript | 2 -- libs/clearlooks-newer/wscript | 3 +-- libs/evoral/wscript | 3 --- libs/fluidsynth/wscript | 3 --- libs/fst/wscript | 2 -- libs/gtkmm2ext/wscript | 2 -- libs/hidapi/wscript | 2 -- libs/libltc/wscript | 3 --- libs/lua/wscript | 3 +-- libs/midi++2/wscript | 2 -- libs/panners/1in2out/wscript | 2 +- libs/panners/2in2out/wscript | 2 +- libs/panners/stereobalance/wscript | 2 +- libs/panners/vbap/wscript | 2 +- libs/panners/wscript | 1 - libs/pbd/wscript | 2 -- libs/plugins/a-comp.lv2/wscript | 2 -- libs/plugins/a-delay.lv2/wscript | 2 -- libs/plugins/a-eq.lv2/wscript | 2 -- libs/plugins/a-exp.lv2/wscript | 2 -- libs/plugins/a-fluidsynth.lv2/wscript | 2 -- libs/plugins/a-reverb.lv2/wscript | 2 -- libs/plugins/reasonablesynth.lv2/wscript | 2 -- libs/ptformat/wscript | 3 +-- libs/qm-dsp/wscript | 3 --- libs/surfaces/cc121/wscript | 2 +- libs/surfaces/contourdesign/wscript | 2 +- libs/surfaces/control_protocol/wscript | 2 +- libs/surfaces/faderport/wscript | 2 +- libs/surfaces/faderport8/wscript | 2 +- libs/surfaces/frontier/wscript | 2 +- libs/surfaces/generic_midi/wscript | 2 +- libs/surfaces/launch_control_xl/wscript | 3 +-- libs/surfaces/mackie/wscript | 2 +- libs/surfaces/maschine2/wscript | 2 -- libs/surfaces/osc/wscript | 2 +- libs/surfaces/push2/wscript | 2 -- libs/surfaces/tranzport/wscript | 2 +- libs/surfaces/us2400/wscript | 2 +- libs/surfaces/websockets/wscript | 2 +- libs/surfaces/wiimote/wscript | 2 +- libs/surfaces/wscript | 1 - libs/temporal/wscript | 3 +-- libs/vamp-plugins/wscript | 2 -- libs/vamp-pyin/wscript | 3 +-- libs/vfork/wscript | 3 +-- libs/waveview/wscript | 2 -- libs/widgets/wscript | 2 -- libs/zita-convolver/wscript | 2 -- libs/zita-resampler/wscript | 3 +-- luasession/wscript | 2 -- session_utils/wscript | 2 -- tools/gccabicheck/wscript | 3 +-- tools/sanity_check/wscript | 3 +-- 68 files changed, 31 insertions(+), 112 deletions(-) diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 2662d67a60..e82f828145 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -430,8 +430,6 @@ def options(opt): def configure(conf): conf.load('misc') - conf.load('compiler_cxx') - autowaf.configure(conf) # TODO: Insert a sanity check for on OS X to ensure CoreAudio is present diff --git a/headless/wscript b/headless/wscript index 2ad37d97ea..5b97c89427 100644 --- a/headless/wscript +++ b/headless/wscript @@ -23,8 +23,6 @@ def options(opt): def configure(conf): conf.load('misc') - conf.load('compiler_cxx') - autowaf.configure(conf) def build(bld): diff --git a/libs/appleutility/wscript b/libs/appleutility/wscript index 63a1a1a465..1480ffd623 100644 --- a/libs/appleutility/wscript +++ b/libs/appleutility/wscript @@ -25,7 +25,6 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - autowaf.configure(conf) if conf.env['build_target'] in ['panther', 'tiger', 'leopard'] or (Options.options.ppc and conf.env['build_target'] == 'snowleopard'): conf.env.append_value ('CFLAGS', '-DCOREAUDIO105') conf.env.append_value ('CXXFLAGS', '-DCOREAUDIO105') diff --git a/libs/ardour/wscript b/libs/ardour/wscript index bdcb3a62b6..10c92a3591 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -295,10 +295,8 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.load('compiler_cxx') conf.load('gas') # we don't use hard-coded micro versions with ardour, so hard code it to zero - autowaf.configure(conf) autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO', atleast_version='0.3.2') autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO4', diff --git a/libs/ardouralsautil/wscript b/libs/ardouralsautil/wscript index 42c5e8678e..a6fc2c214f 100644 --- a/libs/ardouralsautil/wscript +++ b/libs/ardouralsautil/wscript @@ -16,7 +16,6 @@ def options(opt): def configure(conf): - autowaf.configure(conf) if re.search ("linux", sys.platform) != None and Options.options.dist_target != 'mingw': autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA') autowaf.check_pkg(conf, 'dbus-1', uselib_store='DBUS', mandatory = False) diff --git a/libs/audiographer/wscript b/libs/audiographer/wscript index 4efd1bda98..7c88524355 100644 --- a/libs/audiographer/wscript +++ b/libs/audiographer/wscript @@ -26,8 +26,6 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.load('compiler_cxx') - autowaf.configure(conf) autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False) autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0', mandatory=False) diff --git a/libs/auscan/wscript b/libs/auscan/wscript index 3a8c02d334..67de4c8f1c 100644 --- a/libs/auscan/wscript +++ b/libs/auscan/wscript @@ -15,8 +15,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.load('compiler_cxx') - autowaf.configure(conf) + pass def build(bld): if bld.is_defined('AUDIOUNIT_SUPPORT'): diff --git a/libs/backends/alsa/wscript b/libs/backends/alsa/wscript index 32cce76aac..ebeaad2ca8 100644 --- a/libs/backends/alsa/wscript +++ b/libs/backends/alsa/wscript @@ -14,7 +14,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - autowaf.configure(conf) + pass def build(bld): obj = bld(features = 'cxx cxxshlib') diff --git a/libs/backends/coreaudio/wscript b/libs/backends/coreaudio/wscript index 941ede0e47..f7ab400bbf 100644 --- a/libs/backends/coreaudio/wscript +++ b/libs/backends/coreaudio/wscript @@ -15,7 +15,6 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - autowaf.configure(conf) if Options.options.ppc: conf.env['build_arch'] = "ppc" diff --git a/libs/backends/dummy/wscript b/libs/backends/dummy/wscript index 139f65c870..717e6dc1c1 100644 --- a/libs/backends/dummy/wscript +++ b/libs/backends/dummy/wscript @@ -14,7 +14,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - autowaf.configure(conf) + pass def build(bld): obj = bld(features = 'cxx cxxshlib') diff --git a/libs/backends/jack/wscript b/libs/backends/jack/wscript index 88dad383d2..23ac7a8026 100644 --- a/libs/backends/jack/wscript +++ b/libs/backends/jack/wscript @@ -25,7 +25,6 @@ def configure(conf): if Options.options.dist_target == 'mingw': autowaf.check_pkg(conf, 'portaudio-2.0', uselib_store='PORTAUDIO', atleast_version='19') - autowaf.configure(conf) if Options.options.libjack_link == 'auto': if Options.options.dist_target == 'mingw' or sys.platform == 'darwin': diff --git a/libs/backends/portaudio/wscript b/libs/backends/portaudio/wscript index 150b176d00..2a7bc2323b 100644 --- a/libs/backends/portaudio/wscript +++ b/libs/backends/portaudio/wscript @@ -15,7 +15,6 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - autowaf.configure(conf) autowaf.check_pkg(conf, 'portaudio-2.0', uselib_store='PORTAUDIO', atleast_version='19') conf.check(header_name='pa_asio.h', define_name='WITH_ASIO', mandatory=False) diff --git a/libs/backends/pulseaudio/wscript b/libs/backends/pulseaudio/wscript index 73ebd5a4d6..ca5258c869 100644 --- a/libs/backends/pulseaudio/wscript +++ b/libs/backends/pulseaudio/wscript @@ -14,7 +14,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - autowaf.configure(conf) + pass def build(bld): obj = bld(features = 'cxx cxxshlib') diff --git a/libs/backends/wscript b/libs/backends/wscript index 833d831e27..8eaa1232fd 100644 --- a/libs/backends/wscript +++ b/libs/backends/wscript @@ -18,7 +18,6 @@ def sub_config_and_use(conf, name, has_objects = True): def configure(conf): autowaf.set_recursive() - autowaf.configure(conf) backends = conf.env['BACKENDS'] for i in backends: diff --git a/libs/canvas/wscript b/libs/canvas/wscript index f76cc4c18e..765119c64f 100644 --- a/libs/canvas/wscript +++ b/libs/canvas/wscript @@ -71,8 +71,6 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.load ('compiler_cxx') - autowaf.configure(conf) autowaf.check_pkg(conf, 'cairomm-1.0', uselib_store='CAIROMM', atleast_version='1.8.4') def build(bld): diff --git a/libs/clearlooks-newer/wscript b/libs/clearlooks-newer/wscript index 36637971b1..93fda4daf1 100644 --- a/libs/clearlooks-newer/wscript +++ b/libs/clearlooks-newer/wscript @@ -12,8 +12,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.load('compiler_c') - autowaf.configure(conf) + pass def build(bld): obj = bld(features = 'c cshlib') diff --git a/libs/evoral/wscript b/libs/evoral/wscript index c8eb7c1f9c..2f37e462f6 100644 --- a/libs/evoral/wscript +++ b/libs/evoral/wscript @@ -34,9 +34,6 @@ def options(opt): help='Build internal libs as shared libraries') def configure(conf): - conf.load('compiler_c') - conf.load('compiler_cxx') - autowaf.configure(conf) #autowaf.display_header('Evoral Configuration') autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False) diff --git a/libs/fluidsynth/wscript b/libs/fluidsynth/wscript index f64c1f943e..2eb281c41c 100644 --- a/libs/fluidsynth/wscript +++ b/libs/fluidsynth/wscript @@ -25,9 +25,6 @@ def options(opt): def configure(conf): if conf.is_defined('USE_EXTERNAL_LIBS'): autowaf.check_pkg(conf, 'fluidsynth', uselib_store='LIBFLUIDSYNTH', atleast_version=LIBFLUIDSYNTH_VERSION, mandatory=True) - else: - conf.load('compiler_c') - autowaf.configure(conf) def build(bld): if bld.is_defined('USE_EXTERNAL_LIBS'): diff --git a/libs/fst/wscript b/libs/fst/wscript index 5e1576da28..e814277b03 100644 --- a/libs/fst/wscript +++ b/libs/fst/wscript @@ -21,8 +21,6 @@ def options(opt): def configure(conf): conf.load('misc') - conf.load('compiler_cxx') - autowaf.configure(conf) if conf.env['WINDOWS_VST_SUPPORT'] == True: conf.check(compiler='cxx', lib='gdi32', mandatory=True, uselib_store='GDI32') diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript index 90bf1c8880..de6cbb445f 100644 --- a/libs/gtkmm2ext/wscript +++ b/libs/gtkmm2ext/wscript @@ -62,8 +62,6 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.load('compiler_cxx') - autowaf.configure(conf) autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM', atleast_version='2.8') autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK', atleast_version='2.12.1') diff --git a/libs/hidapi/wscript b/libs/hidapi/wscript index 383289fbec..b2fcd91393 100644 --- a/libs/hidapi/wscript +++ b/libs/hidapi/wscript @@ -33,8 +33,6 @@ def configure(conf): conf.define ('HAVE_HIDAPI', 1) else: print ("hidapi is not yet available for the given system") - conf.load('compiler_c') - autowaf.configure(conf) def build(bld): if bld.is_defined('USE_EXTERNAL_LIBS'): diff --git a/libs/libltc/wscript b/libs/libltc/wscript index fde888c426..c872c04e44 100644 --- a/libs/libltc/wscript +++ b/libs/libltc/wscript @@ -31,9 +31,6 @@ def options(opt): def configure(conf): if conf.is_defined('USE_EXTERNAL_LIBS'): autowaf.check_pkg(conf, 'ltc', uselib_store='LIBLTC', atleast_version=LIBLTC_LIB_VERSION, mandatory=True) - else: - conf.load('compiler_c') - autowaf.configure(conf) def build(bld): if bld.is_defined('USE_EXTERNAL_LIBS'): diff --git a/libs/lua/wscript b/libs/lua/wscript index 7d1895a5bf..467e1eee0f 100644 --- a/libs/lua/wscript +++ b/libs/lua/wscript @@ -17,8 +17,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.load('compiler_c') - autowaf.configure(conf) + pass def build(bld): obj=bld.stlib (source = ['lua.cc', 'luastate.cc'], diff --git a/libs/midi++2/wscript b/libs/midi++2/wscript index a2d9f50137..985b68a60b 100644 --- a/libs/midi++2/wscript +++ b/libs/midi++2/wscript @@ -44,8 +44,6 @@ def options(opt): help="Build unit tests") def configure(conf): - conf.load('compiler_cxx') - autowaf.configure(conf) autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False) autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML') autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0') diff --git a/libs/panners/1in2out/wscript b/libs/panners/1in2out/wscript index d415c045a2..a16f493475 100644 --- a/libs/panners/1in2out/wscript +++ b/libs/panners/1in2out/wscript @@ -10,7 +10,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - autowaf.configure(conf) + pass def build(bld): obj = bld(features = 'cxx cxxshlib') diff --git a/libs/panners/2in2out/wscript b/libs/panners/2in2out/wscript index ef3e6c8469..1ec2fab1c2 100644 --- a/libs/panners/2in2out/wscript +++ b/libs/panners/2in2out/wscript @@ -10,7 +10,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - autowaf.configure(conf) + pass def build(bld): obj = bld(features = 'cxx cxxshlib') diff --git a/libs/panners/stereobalance/wscript b/libs/panners/stereobalance/wscript index e29abfbd97..e2a08216dd 100644 --- a/libs/panners/stereobalance/wscript +++ b/libs/panners/stereobalance/wscript @@ -10,7 +10,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - autowaf.configure(conf) + pass def build(bld): obj = bld(features = 'cxx cxxshlib') diff --git a/libs/panners/vbap/wscript b/libs/panners/vbap/wscript index 6843112c94..7526cf0a2c 100644 --- a/libs/panners/vbap/wscript +++ b/libs/panners/vbap/wscript @@ -10,7 +10,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - autowaf.configure(conf) + pass def build(bld): obj = bld(features = 'cxx cxxshlib') diff --git a/libs/panners/wscript b/libs/panners/wscript index 9d30bab51f..ef79a82b05 100644 --- a/libs/panners/wscript +++ b/libs/panners/wscript @@ -18,7 +18,6 @@ def sub_config_and_use(conf, name, has_objects = True): def configure(conf): autowaf.set_recursive() - autowaf.configure(conf) panners = [ '2in2out', '1in2out', 'vbap', 'stereobalance' ] diff --git a/libs/pbd/wscript b/libs/pbd/wscript index d57cd67d5b..2dda798a45 100644 --- a/libs/pbd/wscript +++ b/libs/pbd/wscript @@ -102,8 +102,6 @@ def options(opt): help='Build internal libs as shared libraries') def configure(conf): - conf.load('compiler_cxx') - autowaf.configure(conf) autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML') autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0') autowaf.check_pkg(conf, 'libcurl', uselib_store='CURL', atleast_version='7.0.0', mandatory=True) diff --git a/libs/plugins/a-comp.lv2/wscript b/libs/plugins/a-comp.lv2/wscript index f2948a12c1..636803b905 100644 --- a/libs/plugins/a-comp.lv2/wscript +++ b/libs/plugins/a-comp.lv2/wscript @@ -13,8 +13,6 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.load('compiler_c') - autowaf.configure(conf) autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0', uselib_store='LV2_1_0_0') autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', atleast_version='1.12.0') diff --git a/libs/plugins/a-delay.lv2/wscript b/libs/plugins/a-delay.lv2/wscript index 1699ca72d7..cfe5437ce2 100644 --- a/libs/plugins/a-delay.lv2/wscript +++ b/libs/plugins/a-delay.lv2/wscript @@ -13,8 +13,6 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.load('compiler_c') - autowaf.configure(conf) autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0', uselib_store='LV2_1_0_0') autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', atleast_version='1.12.0') diff --git a/libs/plugins/a-eq.lv2/wscript b/libs/plugins/a-eq.lv2/wscript index cfb82d5ee2..ac7d817040 100644 --- a/libs/plugins/a-eq.lv2/wscript +++ b/libs/plugins/a-eq.lv2/wscript @@ -13,8 +13,6 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.load('compiler_c') - autowaf.configure(conf) autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0', uselib_store='LV2_1_0_0') autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', atleast_version='1.12.0') diff --git a/libs/plugins/a-exp.lv2/wscript b/libs/plugins/a-exp.lv2/wscript index fd42c9bd57..f048327fa1 100644 --- a/libs/plugins/a-exp.lv2/wscript +++ b/libs/plugins/a-exp.lv2/wscript @@ -13,8 +13,6 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.load('compiler_c') - autowaf.configure(conf) autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0', uselib_store='LV2_1_0_0') autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', atleast_version='1.12.0') diff --git a/libs/plugins/a-fluidsynth.lv2/wscript b/libs/plugins/a-fluidsynth.lv2/wscript index eb8eeaa39c..9cbce04f37 100644 --- a/libs/plugins/a-fluidsynth.lv2/wscript +++ b/libs/plugins/a-fluidsynth.lv2/wscript @@ -13,8 +13,6 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.load('compiler_c') - autowaf.configure(conf) autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0', uselib_store='LV2_1_0_0') diff --git a/libs/plugins/a-reverb.lv2/wscript b/libs/plugins/a-reverb.lv2/wscript index 60ca671c08..1186563e8e 100644 --- a/libs/plugins/a-reverb.lv2/wscript +++ b/libs/plugins/a-reverb.lv2/wscript @@ -13,8 +13,6 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.load('compiler_c') - autowaf.configure(conf) autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0', uselib_store='LV2_1_0_0') diff --git a/libs/plugins/reasonablesynth.lv2/wscript b/libs/plugins/reasonablesynth.lv2/wscript index 7c382ae533..ef15b28c4b 100644 --- a/libs/plugins/reasonablesynth.lv2/wscript +++ b/libs/plugins/reasonablesynth.lv2/wscript @@ -13,8 +13,6 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.load('compiler_c') - autowaf.configure(conf) autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0', uselib_store='LV2_1_0_0') diff --git a/libs/ptformat/wscript b/libs/ptformat/wscript index 9ec3bd1a5a..9724b09ddf 100644 --- a/libs/ptformat/wscript +++ b/libs/ptformat/wscript @@ -24,8 +24,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.load('compiler_cxx') - autowaf.configure(conf) + pass def build(bld): # Library diff --git a/libs/qm-dsp/wscript b/libs/qm-dsp/wscript index 775098e06b..ad78eb59f5 100644 --- a/libs/qm-dsp/wscript +++ b/libs/qm-dsp/wscript @@ -26,9 +26,6 @@ def configure(conf): if conf.is_defined('USE_EXTERNAL_LIBS'): conf.check_cxx(header_name="base/Pitch.h", mandatory=True) conf.check_cxx(lib="qm-dsp", uselib_store="QMDSP", mandatory=True) - else: - conf.load('compiler_cxx') - autowaf.configure(conf) def build(bld): if bld.is_defined('USE_EXTERNAL_LIBS'): diff --git a/libs/surfaces/cc121/wscript b/libs/surfaces/cc121/wscript index 8195bb53a6..0c57c9ed1b 100644 --- a/libs/surfaces/cc121/wscript +++ b/libs/surfaces/cc121/wscript @@ -10,7 +10,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - autowaf.configure(conf) + pass def build(bld): obj = bld(features = 'cxx cxxshlib') diff --git a/libs/surfaces/contourdesign/wscript b/libs/surfaces/contourdesign/wscript index 1f40dc4886..23db001797 100644 --- a/libs/surfaces/contourdesign/wscript +++ b/libs/surfaces/contourdesign/wscript @@ -10,7 +10,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - autowaf.configure(conf) + pass def build(bld): obj = bld(features = 'cxx cxxshlib') diff --git a/libs/surfaces/control_protocol/wscript b/libs/surfaces/control_protocol/wscript index 76dda1118e..f985681e78 100644 --- a/libs/surfaces/control_protocol/wscript +++ b/libs/surfaces/control_protocol/wscript @@ -15,7 +15,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - autowaf.configure(conf) + pass def build(bld): if bld.is_defined ('INTERNAL_SHARED_LIBS'): diff --git a/libs/surfaces/faderport/wscript b/libs/surfaces/faderport/wscript index f72a115e43..7381d94f87 100644 --- a/libs/surfaces/faderport/wscript +++ b/libs/surfaces/faderport/wscript @@ -10,7 +10,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - autowaf.configure(conf) + pass def build(bld): obj = bld(features = 'cxx cxxshlib') diff --git a/libs/surfaces/faderport8/wscript b/libs/surfaces/faderport8/wscript index 07e1eb381e..e04bf1f939 100644 --- a/libs/surfaces/faderport8/wscript +++ b/libs/surfaces/faderport8/wscript @@ -19,7 +19,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - autowaf.configure(conf) + pass def build(bld): obj = bld(features = 'cxx cxxshlib') diff --git a/libs/surfaces/frontier/wscript b/libs/surfaces/frontier/wscript index c8613c0ba3..63385e6795 100644 --- a/libs/surfaces/frontier/wscript +++ b/libs/surfaces/frontier/wscript @@ -10,7 +10,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - autowaf.configure(conf) + pass def build(bld): # Generic MIDI diff --git a/libs/surfaces/generic_midi/wscript b/libs/surfaces/generic_midi/wscript index 73e55c3fa4..034ec1d496 100644 --- a/libs/surfaces/generic_midi/wscript +++ b/libs/surfaces/generic_midi/wscript @@ -10,7 +10,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - autowaf.configure(conf) + pass def build(bld): obj = bld(features = 'cxx cxxshlib') diff --git a/libs/surfaces/launch_control_xl/wscript b/libs/surfaces/launch_control_xl/wscript index e573101331..d54dcdfb9f 100644 --- a/libs/surfaces/launch_control_xl/wscript +++ b/libs/surfaces/launch_control_xl/wscript @@ -12,8 +12,7 @@ def options(opt): def configure(conf): - conf.load('compiler_cxx') - autowaf.configure(conf) + pass def build(bld): diff --git a/libs/surfaces/mackie/wscript b/libs/surfaces/mackie/wscript index 2ed12fb10b..0c2e56b2fb 100644 --- a/libs/surfaces/mackie/wscript +++ b/libs/surfaces/mackie/wscript @@ -10,7 +10,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - autowaf.configure(conf) + pass def build(bld): obj = bld(features = 'cxx cxxshlib') diff --git a/libs/surfaces/maschine2/wscript b/libs/surfaces/maschine2/wscript index 5432141b46..2ae1a2a144 100644 --- a/libs/surfaces/maschine2/wscript +++ b/libs/surfaces/maschine2/wscript @@ -10,8 +10,6 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.load ('compiler_cxx') - autowaf.configure(conf) autowaf.check_pkg(conf, 'pangomm-1.4', uselib_store='PANGOMM', atleast_version='1.4', mandatory=True) autowaf.check_pkg(conf, 'cairomm-1.0', uselib_store='CAIROMM', atleast_version='1.8.4', mandatory=True) diff --git a/libs/surfaces/osc/wscript b/libs/surfaces/osc/wscript index 447979a27d..c4d2c7ca3f 100644 --- a/libs/surfaces/osc/wscript +++ b/libs/surfaces/osc/wscript @@ -10,7 +10,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - autowaf.configure(conf) + pass def build(bld): obj = bld(features = 'cxx cxxshlib') diff --git a/libs/surfaces/push2/wscript b/libs/surfaces/push2/wscript index b595b1702b..f414a61b10 100644 --- a/libs/surfaces/push2/wscript +++ b/libs/surfaces/push2/wscript @@ -10,8 +10,6 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.load ('compiler_cxx') - autowaf.configure(conf) autowaf.check_pkg(conf, 'pangomm-1.4', uselib_store='PANGOMM', atleast_version='1.4', mandatory=True) autowaf.check_pkg(conf, 'cairomm-1.0', uselib_store='CAIROMM', atleast_version='1.8.4', mandatory=True) diff --git a/libs/surfaces/tranzport/wscript b/libs/surfaces/tranzport/wscript index 1af293ce93..9374a20cf2 100644 --- a/libs/surfaces/tranzport/wscript +++ b/libs/surfaces/tranzport/wscript @@ -10,7 +10,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - autowaf.configure(conf) + pass def build(bld): obj = bld(features = 'cxx cxxshlib') diff --git a/libs/surfaces/us2400/wscript b/libs/surfaces/us2400/wscript index f8bddf8d58..a159bddc2d 100644 --- a/libs/surfaces/us2400/wscript +++ b/libs/surfaces/us2400/wscript @@ -10,7 +10,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - autowaf.configure(conf) + pass def build(bld): obj = bld(features = 'cxx cxxshlib') diff --git a/libs/surfaces/websockets/wscript b/libs/surfaces/websockets/wscript index 90fdf3e661..4ce0772fa0 100644 --- a/libs/surfaces/websockets/wscript +++ b/libs/surfaces/websockets/wscript @@ -10,7 +10,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - autowaf.configure(conf) + pass def build(bld): obj = bld(features = 'cxx cxxshlib') diff --git a/libs/surfaces/wiimote/wscript b/libs/surfaces/wiimote/wscript index d38296f37f..fd904b9c79 100644 --- a/libs/surfaces/wiimote/wscript +++ b/libs/surfaces/wiimote/wscript @@ -10,7 +10,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - autowaf.configure(conf) + pass def build(bld): obj = bld(features = 'cxx cxxshlib') diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript index 061bba8099..779fd5d68d 100644 --- a/libs/surfaces/wscript +++ b/libs/surfaces/wscript @@ -41,7 +41,6 @@ def configure(conf): global children autowaf.set_recursive() - autowaf.configure(conf) autowaf.check_pkg(conf, 'libusb-1.0', uselib_store='USB', mandatory=False) #if Options.options.tranzport and conf.is_defined('HAVE_USB'): diff --git a/libs/temporal/wscript b/libs/temporal/wscript index 83f566a458..46c374ed80 100644 --- a/libs/temporal/wscript +++ b/libs/temporal/wscript @@ -40,8 +40,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.load('compiler_cxx') - autowaf.configure(conf) + pass def build(bld): # Library diff --git a/libs/vamp-plugins/wscript b/libs/vamp-plugins/wscript index f3e0024ee9..44b33b566c 100644 --- a/libs/vamp-plugins/wscript +++ b/libs/vamp-plugins/wscript @@ -23,8 +23,6 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.load('compiler_cxx') - autowaf.configure(conf) autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', mandatory=True) autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO', atleast_version='0.3.2') diff --git a/libs/vamp-pyin/wscript b/libs/vamp-pyin/wscript index 5c9cb3014a..5e917a3fbf 100644 --- a/libs/vamp-pyin/wscript +++ b/libs/vamp-pyin/wscript @@ -20,8 +20,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.load('compiler_cxx') - autowaf.configure(conf) + pass def build(bld): # Library diff --git a/libs/vfork/wscript b/libs/vfork/wscript index 8f4efbe0c7..8de403cd16 100644 --- a/libs/vfork/wscript +++ b/libs/vfork/wscript @@ -12,8 +12,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.load('compiler_c') - autowaf.configure(conf) + pass def build(bld): if bld.env['build_target'] == 'mingw': diff --git a/libs/waveview/wscript b/libs/waveview/wscript index 996cf67c9a..f3d28404f5 100644 --- a/libs/waveview/wscript +++ b/libs/waveview/wscript @@ -35,8 +35,6 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.load ('compiler_cxx') - autowaf.configure(conf) autowaf.check_pkg(conf, 'cairomm-1.0', uselib_store='CAIROMM', atleast_version='1.8.4') def build(bld): diff --git a/libs/widgets/wscript b/libs/widgets/wscript index 1a1b24f5db..4d10596974 100644 --- a/libs/widgets/wscript +++ b/libs/widgets/wscript @@ -59,8 +59,6 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.load ('compiler_cxx') - autowaf.configure(conf) autowaf.check_pkg(conf, 'cairomm-1.0', uselib_store='CAIROMM', atleast_version='1.8.4') def build(bld): diff --git a/libs/zita-convolver/wscript b/libs/zita-convolver/wscript index 3bde65575c..4b29cccb89 100644 --- a/libs/zita-convolver/wscript +++ b/libs/zita-convolver/wscript @@ -29,8 +29,6 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.load ('compiler_cxx') - autowaf.configure(conf) autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', mandatory=True) def build(bld): diff --git a/libs/zita-resampler/wscript b/libs/zita-resampler/wscript index 3d6027a0bc..54c851e72e 100644 --- a/libs/zita-resampler/wscript +++ b/libs/zita-resampler/wscript @@ -37,8 +37,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.load ('compiler_cxx') - autowaf.configure(conf) + pass def build(bld): obj = bld.stlib(features = 'cxx cxxstlib', source = zresampler_sources) diff --git a/luasession/wscript b/luasession/wscript index 076e8d81ec..fc3f6adad7 100755 --- a/luasession/wscript +++ b/luasession/wscript @@ -17,14 +17,12 @@ def options(opt): def configure(conf): conf.load('misc') - conf.load('compiler_cxx') conf.check_cc( header_name='stdio.h readline/readline.h', lib='readline', uselib_store='READLINE', define_name='HAVE_READLINE', mandatory=False) - autowaf.configure(conf) def build(bld): VERSION = "%s.%s" % (bld.env['MAJOR'], bld.env['MINOR']) diff --git a/session_utils/wscript b/session_utils/wscript index 2c2d158661..25bfc06e5e 100644 --- a/session_utils/wscript +++ b/session_utils/wscript @@ -24,8 +24,6 @@ def configure(conf): autowaf.display_msg(conf, 'build session-utils', 'yes') conf.load('misc') - conf.load('compiler_cxx') - autowaf.configure(conf) def build_ardour_util(bld, util): pgmprefix = bld.env['PROGRAM_NAME'].lower() + str(bld.env['MAJOR']) diff --git a/tools/gccabicheck/wscript b/tools/gccabicheck/wscript index 1b89cf57dd..27a3c3f84f 100644 --- a/tools/gccabicheck/wscript +++ b/tools/gccabicheck/wscript @@ -13,8 +13,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.load('compiler_c') - autowaf.configure(conf) + pass def build(bld): obj = bld(features = 'c cprogram') diff --git a/tools/sanity_check/wscript b/tools/sanity_check/wscript index 000753e18b..406e0778a9 100644 --- a/tools/sanity_check/wscript +++ b/tools/sanity_check/wscript @@ -11,8 +11,7 @@ def options(opt): autowaf.set_options(opt) def configure(conf): - conf.load('compiler_cxx') - autowaf.configure(conf) + pass def build(bld): obj = bld(features = 'cxx cxxprogram')