remove use of hardcoded -fPIC compiler flag, and use compiler flag dict instead

This commit is contained in:
Paul Davis 2018-10-14 22:06:11 -04:00
parent d7fca7c828
commit 8ed33f1bc7
24 changed files with 41 additions and 40 deletions

View file

@ -78,8 +78,8 @@ def build(bld):
audiographer.defines = [ 'LIBAUDIOGRAPHER_DLL_EXPORTS=1' ] audiographer.defines = [ 'LIBAUDIOGRAPHER_DLL_EXPORTS=1' ]
else: else:
audiographer = bld.stlib(features = 'c cxx cstlib cxxstlib', source=audiographer_sources) audiographer = bld.stlib(features = 'c cxx cstlib cxxstlib', source=audiographer_sources)
audiographer.cxxflags = [ '-fPIC' ] audiographer.cxxflags = [ bld.env['compiler_flags_dict']['pic'] ]
audiographer.cflags = [ '-fPIC' ] audiographer.cflags = [ bld.env['compiler_flags_dict']['pic'] ]
audiographer.defines = [] audiographer.defines = []
audiographer.name = 'libaudiographer' audiographer.name = 'libaudiographer'

View file

@ -80,8 +80,8 @@ def build(bld):
obj.use = 'libardour libpbd ardouralsautil' obj.use = 'libardour libpbd ardouralsautil'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'backends') obj.install_path = os.path.join(bld.env['LIBDIR'], 'backends')
if bld.env['build_target'] != 'mingw': if bld.env['build_target'] != 'mingw':
obj.cxxflags = [ '-fPIC' ] obj.cxxflags = [ bld.env['compiler_flags_dict']['pic'] ]
obj.cflags = [ '-fPIC' ] obj.cflags = [ bld.env['compiler_flags_dict']['pic'] ]
else: else:
obj.cxxflags = [ ] obj.cxxflags = [ ]
obj.cflags = [ ] obj.cflags = [ ]

View file

@ -80,8 +80,8 @@ def build(bld):
obj.defines = [ 'LIBCANVAS_DLL_EXPORTS=1' ] obj.defines = [ 'LIBCANVAS_DLL_EXPORTS=1' ]
else: else:
obj = bld.stlib(features = 'cxx cxxstlib', source=canvas_sources) obj = bld.stlib(features = 'cxx cxxstlib', source=canvas_sources)
obj.cxxflags = [ '-fPIC' ] obj.cxxflags = [ bld.env['compiler_flags_dict']['pic'] ]
obj.cflags = [ '-fPIC' ] obj.cflags = [ bld.env['compiler_flags_dict']['pic'] ]
obj.defines = [ ] obj.defines = [ ]
obj.export_includes = ['.'] obj.export_includes = ['.']

View file

@ -83,8 +83,8 @@ def build(bld):
libsmf.use = [ 'libtemporal' ] libsmf.use = [ 'libtemporal' ]
libsmf.install_path = None libsmf.install_path = None
if bld.env['build_target'] != 'mingw': if bld.env['build_target'] != 'mingw':
libsmf.cxxflags = [ '-fPIC' ] libsmf.cxxflags = [ bld.env['compiler_flags_dict']['pic'] ]
libsmf.cflags = [ '-fPIC' ] libsmf.cflags = [ bld.env['compiler_flags_dict']['pic'] ]
lib_source = ''' lib_source = '''
src/Control.cpp src/Control.cpp
@ -106,8 +106,8 @@ def build(bld):
obj.defines = [ 'LIBEVORAL_DLL_EXPORTS' ] obj.defines = [ 'LIBEVORAL_DLL_EXPORTS' ]
else: else:
obj = bld.stlib(features = 'c cxx cstlib cxxstlib', source=lib_source) obj = bld.stlib(features = 'c cxx cstlib cxxstlib', source=lib_source)
obj.cxxflags = [ '-fPIC' ] obj.cxxflags = [ bld.env['compiler_flags_dict']['pic'] ]
obj.cflags = [ '-fPIC' ] obj.cflags = [ bld.env['compiler_flags_dict']['pic'] ]
obj.defines = [ ] obj.defines = [ ]
obj.export_includes = ['.'] obj.export_includes = ['.']

View file

@ -61,7 +61,7 @@ def build(bld):
'src/fluid_settings.c', 'src/fluid_settings.c',
'src/fluid_sys.c' 'src/fluid_sys.c'
], ],
cflags = [ '-fPIC', '-fvisibility=hidden' ], cflags = [ bld.env['compiler_flags_dict']['pic'], '-fvisibility=hidden' ],
includes = ['.', 'src/' ], includes = ['.', 'src/' ],
target = 'libfluidsynth', target = 'libfluidsynth',
use = 'libfluidsynth_includes', use = 'libfluidsynth_includes',

View file

@ -66,7 +66,7 @@ def build(bld):
obj.target = 'ardour-vst-scanner.exe.so' obj.target = 'ardour-vst-scanner.exe.so'
obj.uselib = ['GIOMM', 'DL'] obj.uselib = ['GIOMM', 'DL']
obj.use = [ 'libpbd' ] obj.use = [ 'libpbd' ]
obj.cxxflags = [ '-fPIC' ] obj.cxxflags = [ bld.env['compiler_flags_dict']['pic'] ]
else: else:
obj = bld (features = 'cxx c cxxprogram') obj = bld (features = 'cxx c cxxprogram')
obj.source = ( 'scanner.cc' ) obj.source = ( 'scanner.cc' )

View file

@ -76,7 +76,7 @@ def build(bld):
obj.defines = [ 'LIBGTKMM2EXT_DLL_EXPORTS', 'ABSTRACT_UI_EXPORTS' ] obj.defines = [ 'LIBGTKMM2EXT_DLL_EXPORTS', 'ABSTRACT_UI_EXPORTS' ]
else: else:
obj = bld.stlib(features = 'c cxx cstlib cxxstlib', source=sources) obj = bld.stlib(features = 'c cxx cstlib cxxstlib', source=sources)
obj.cxxflags = [ '-fPIC' ] obj.cxxflags = [ bld.env['compiler_flags_dict']['pic'] ]
obj.defines = [ ] obj.defines = [ ]
obj.export_includes = ['.'] obj.export_includes = ['.']

View file

@ -57,7 +57,7 @@ def build(bld):
obj.linkflags = [ '-lsetupapi', '-mwindows' ] obj.linkflags = [ '-lsetupapi', '-mwindows' ]
obj.uselib = 'SETUPAPI' obj.uselib = 'SETUPAPI'
else: else:
obj.cflags += [ '-fPIC' ] obj.cflags += [ bld.env['compiler_flags_dict']['pic'] ]
if sys.platform == 'darwin': if sys.platform == 'darwin':
obj.source = 'mac/hid.c' obj.source = 'mac/hid.c'
obj.framework = [ 'IOKit', 'CoreFoundation' ] obj.framework = [ 'IOKit', 'CoreFoundation' ]

View file

@ -43,7 +43,7 @@ def build(bld):
) )
bld.stlib (source = ['ltc.c', 'timecode.c', 'encoder.c', 'decoder.c'], bld.stlib (source = ['ltc.c', 'timecode.c', 'encoder.c', 'decoder.c'],
cflags = [ '-fPIC' ], cflags = [ bld.env['compiler_flags_dict']['pic'] ],
includes = ['.'], includes = ['.'],
target = 'libltc', target = 'libltc',
use = 'libltc_includes' use = 'libltc_includes'

View file

@ -22,8 +22,8 @@ def configure(conf):
def build(bld): def build(bld):
obj=bld.stlib (source = ['lua.cc', 'luastate.cc'], obj=bld.stlib (source = ['lua.cc', 'luastate.cc'],
cflags = [ '-fPIC' ], cflags = [ bld.env['compiler_flags_dict']['pic'] ],
cxxflags = [ '-fPIC' ], cxxflags = [ bld.env['compiler_flags_dict']['pic'] ],
includes = ['.'], includes = ['.'],
export_includes = ['.'], export_includes = ['.'],
target = 'liblua', target = 'liblua',

View file

@ -61,7 +61,7 @@ def build(bld):
obj.defines = [ 'LIBMIDIPP_DLL_EXPORTS=1' ] obj.defines = [ 'LIBMIDIPP_DLL_EXPORTS=1' ]
else: else:
obj = bld.stlib(features = 'cxx cxxstlib', source=libmidi_sources) obj = bld.stlib(features = 'cxx cxxstlib', source=libmidi_sources)
obj.cxxflags = [ '-fPIC' ] obj.cxxflags = [ bld.env['compiler_flags_dict']['pic'] ]
obj.defines = [] obj.defines = []
# everybody loves JACK # everybody loves JACK

View file

@ -151,8 +151,8 @@ def build(bld):
obj.defines = [ 'LIBPBD_DLL_EXPORTS=1' ] obj.defines = [ 'LIBPBD_DLL_EXPORTS=1' ]
else: else:
obj = bld.stlib(features = 'cxx cxxstlib', source=libpbd_sources) obj = bld.stlib(features = 'cxx cxxstlib', source=libpbd_sources)
obj.cxxflags = [ '-fPIC' ] obj.cxxflags = [ bld.env['compiler_flags_dict']['pic'] ]
obj.cflags = [ '-fPIC' ] obj.cflags = [ bld.env['compiler_flags_dict']['pic'] ]
obj.defines = [] obj.defines = []
if bld.is_defined('DEBUG_RT_ALLOC'): if bld.is_defined('DEBUG_RT_ALLOC'):

View file

@ -39,7 +39,7 @@ def build(bld):
obj = bld(features = 'c cshlib', obj = bld(features = 'c cshlib',
source = 'a-comp.c', source = 'a-comp.c',
name = 'a-comp', name = 'a-comp',
cflags = [ '-fPIC', bld.env['compiler_flags_dict']['c99'] ], cflags = [ bld.env['compiler_flags_dict']['pic'], bld.env['compiler_flags_dict']['c99'] ],
includes = [ '../../ardour', '../shared' ], includes = [ '../../ardour', '../shared' ],
target = '../../LV2/%s/a-comp' % bundle, target = '../../LV2/%s/a-comp' % bundle,
install_path = '${LV2DIR}/%s' % bundle, install_path = '${LV2DIR}/%s' % bundle,

View file

@ -39,7 +39,7 @@ def build(bld):
obj = bld(features = 'c cshlib', obj = bld(features = 'c cshlib',
source = 'a-delay.c', source = 'a-delay.c',
name = 'a-delay', name = 'a-delay',
cflags = [ '-fPIC', bld.env['compiler_flags_dict']['c99'] ], cflags = [ bld.env['compiler_flags_dict']['pic'], bld.env['compiler_flags_dict']['c99'] ],
includes = [ '../../ardour' ], includes = [ '../../ardour' ],
target = '../../LV2/%s/a-delay' % bundle, target = '../../LV2/%s/a-delay' % bundle,
install_path = '${LV2DIR}/%s' % bundle, install_path = '${LV2DIR}/%s' % bundle,

View file

@ -39,7 +39,7 @@ def build(bld):
obj = bld(features = 'c cshlib', obj = bld(features = 'c cshlib',
source = 'a-eq.c', source = 'a-eq.c',
name = 'a-eq', name = 'a-eq',
cflags = [ '-fPIC', bld.env['compiler_flags_dict']['c99'] ], cflags = [ bld.env['compiler_flags_dict']['pic'], bld.env['compiler_flags_dict']['c99'] ],
includes = [ '../../ardour' ], includes = [ '../../ardour' ],
target = '../../LV2/%s/a-eq' % bundle, target = '../../LV2/%s/a-eq' % bundle,
install_path = '${LV2DIR}/%s' % bundle, install_path = '${LV2DIR}/%s' % bundle,

View file

@ -39,7 +39,7 @@ def build(bld):
obj = bld(features = 'c cshlib', obj = bld(features = 'c cshlib',
source = 'a-exp.c', source = 'a-exp.c',
name = 'a-exp', name = 'a-exp',
cflags = [ '-fPIC', bld.env['compiler_flags_dict']['c99'] ], cflags = [ bld.env['compiler_flags_dict']['pic'], bld.env['compiler_flags_dict']['c99'] ],
includes = [ '../../ardour', '../shared' ], includes = [ '../../ardour', '../shared' ],
target = '../../LV2/%s/a-exp' % bundle, target = '../../LV2/%s/a-exp' % bundle,
install_path = '${LV2DIR}/%s' % bundle, install_path = '${LV2DIR}/%s' % bundle,

View file

@ -38,7 +38,7 @@ def build(bld):
obj = bld(features = 'cxx cshlib', obj = bld(features = 'cxx cshlib',
source = 'a-fluidsynth.cc', source = 'a-fluidsynth.cc',
name = 'a-fluidsynth', name = 'a-fluidsynth',
cxxflags = [ '-fPIC' ], cxxflags = [ bld.env['compiler_flags_dict']['pic'] ],
includes = [ '../../ardour' ], includes = [ '../../ardour' ],
target = '../../LV2/%s/a-fluidsynth' % bundle, target = '../../LV2/%s/a-fluidsynth' % bundle,
install_path = '${LV2DIR}/%s' % bundle, install_path = '${LV2DIR}/%s' % bundle,

View file

@ -38,7 +38,7 @@ def build(bld):
obj = bld(features = 'c cshlib', obj = bld(features = 'c cshlib',
source = 'a-reverb.c', source = 'a-reverb.c',
name = 'a-reverb', name = 'a-reverb',
cflags = [ '-fPIC', bld.env['compiler_flags_dict']['c99'] ], cflags = [ bld.env['compiler_flags_dict']['pic'], bld.env['compiler_flags_dict']['c99'] ],
includes = [ '../../ardour' ], includes = [ '../../ardour' ],
target = '../../LV2/%s/a-reverb' % bundle, target = '../../LV2/%s/a-reverb' % bundle,
install_path = '${LV2DIR}/%s' % bundle, install_path = '${LV2DIR}/%s' % bundle,

View file

@ -79,8 +79,9 @@ def build(bld):
obj.vnum = QM_DSP_VERSION obj.vnum = QM_DSP_VERSION
obj.install_path = bld.env['LIBDIR'] obj.install_path = bld.env['LIBDIR']
if bld.env['build_target'] != 'mingw': if bld.env['build_target'] != 'mingw':
obj.cxxflags += [ '-fPIC' ] obj.cxxflags = [ bld.env['compiler_flags_dict']['pic'] ]
obj.cflags += [ '-fPIC' ] obj.cflags = [ bld.env['compiler_flags_dict']['pic'] ]
def shutdown(): def shutdown():
autowaf.shutdown() autowaf.shutdown()

View file

@ -24,7 +24,7 @@ def build(bld):
obj.defines = [ 'LIBCONTROLCP_DLL_EXPORTS' ] obj.defines = [ 'LIBCONTROLCP_DLL_EXPORTS' ]
else: else:
obj = bld.stlib(features = 'c cxx cstlib cxxstlib', source=controlcp_sources) obj = bld.stlib(features = 'c cxx cstlib cxxstlib', source=controlcp_sources)
obj.cxxflags = [ '-fPIC' ] obj.cxxflags = [ bld.env['compiler_flags_dict']['pic'] ]
obj.defines = [ ] obj.defines = [ ]
obj.export_includes = ['.', './control_protocol' ] obj.export_includes = ['.', './control_protocol' ]

View file

@ -40,8 +40,8 @@ def build(bld):
obj.defines = [ 'LIBTEMPORAL_DLL_EXPORTS=1' ] obj.defines = [ 'LIBTEMPORAL_DLL_EXPORTS=1' ]
else: else:
obj = bld.stlib(features = 'cxx cxxstlib', source=temporal_sources) obj = bld.stlib(features = 'cxx cxxstlib', source=temporal_sources)
obj.cxxflags = [ '-fPIC' ] obj.cxxflags = [ bld.env['compiler_flags_dict']['pic'] ]
obj.cflags = [ '-fPIC' ] obj.cflags = [ bld.env['compiler_flags_dict']['pic'] ]
obj.defines = [ ] obj.defines = [ ]
obj.export_includes = ['.'] obj.export_includes = ['.']

View file

@ -46,8 +46,8 @@ def build(bld):
obj.defines = [ 'LIBWAVEVIEW_DLL_EXPORTS=1' ] obj.defines = [ 'LIBWAVEVIEW_DLL_EXPORTS=1' ]
else: else:
obj = bld.stlib(features = 'cxx cxxstlib', source=waveview_sources) obj = bld.stlib(features = 'cxx cxxstlib', source=waveview_sources)
obj.cxxflags = [ '-fPIC' ] obj.cxxflags = [ bld.env['compiler_flags_dict']['pic'] ]
obj.cflags = [ '-fPIC' ] obj.cflags = [ bld.env['compiler_flags_dict']['pic'] ]
obj.defines = [ ] obj.defines = [ ]
obj.export_includes = ['.'] obj.export_includes = ['.']

View file

@ -69,8 +69,8 @@ def build(bld):
obj.defines = [ 'LIBWIDGETS_DLL_EXPORTS=1' ] obj.defines = [ 'LIBWIDGETS_DLL_EXPORTS=1' ]
else: else:
obj = bld.stlib(features = 'cxx cxxstlib', source=widgets_sources) obj = bld.stlib(features = 'cxx cxxstlib', source=widgets_sources)
obj.cxxflags = [ '-fPIC' ] obj.cxxflags = [ bld.env['compiler_flags_dict']['pic'] ]
obj.cflags = [ '-fPIC' ] obj.cflags = [ bld.env['compiler_flags_dict']['pic'] ]
obj.defines = [ ] obj.defines = [ ]
obj.export_includes = ['.'] obj.export_includes = ['.']

View file

@ -42,7 +42,7 @@ def configure(conf):
def build(bld): def build(bld):
obj = bld.stlib(features = 'cxx cxxstlib', source = zresampler_sources) obj = bld.stlib(features = 'cxx cxxstlib', source = zresampler_sources)
obj.cxxflags = [ '-fPIC', '-O3', '-ffast-math' ] obj.cxxflags = [ bld.env['compiler_flags_dict']['pic'], '-O3', '-ffast-math' ]
obj.export_includes = ['.'] obj.export_includes = ['.']
obj.includes = ['.'] obj.includes = ['.']
obj.name = 'zita-resampler' obj.name = 'zita-resampler'