ardour/livetrax
13
0
Fork 0
Code

Fix cross-compile linking (arm-linux ld)

Browse Source 
Explicitly specify required libraries (waf does no longer
forward .uselib dependencies of libraries used by .use).
This leads to undefined symbols.
This commit is contained in:
Robin Gareus 2020-02-14 00:20:45 +01:00
parent 72bf12219e
commit 5794d21a76
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
5 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/wscript
View File

@ -641,7 +641,7 @@ def build(bld):
] ]
obj.install_path = bld.env['DLLDIR'] obj.install_path = bld.env['DLLDIR']
obj.linkflags = '' obj.linkflags = ''
obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL GTKMM CANVAS FFTW3F LO TAGLIB XML LILV' obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL GTKMM CANVAS FFTW3F LO TAGLIB XML LILV RUBBERBAND AUBIO LRDF ARCHIVE VAMPSDK VAMPHOSTSDK'
if sys.platform == 'darwin': if sys.platform == 'darwin':
obj.uselib += ' AUDIOUNITS OSX ' obj.uselib += ' AUDIOUNITS OSX '

10
headless/wscript
View File

@ -58,10 +58,12 @@ def build(bld):
'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"', 'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
] ]
obj.install_path = bld.env['LIBDIR'] obj.install_path = bld.env['LIBDIR']
obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL XML' obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GIOMM GTHREAD OGG CURL DL XML'
obj.uselib += ' FFTW3F' obj.uselib += ' AUDIOUNITS OSX'
obj.uselib += ' AUDIOUNITS OSX LO ' obj.uselib += ' FFTW3F LO TAGLIB LILV RUBBERBAND AUBIO LRDF ARCHIVE VAMPSDK VAMPHOSTSDK'
obj.uselib += ' TAGLIB '
if bld.is_defined('HAVE_SUIL'):
obj.uselib += ' SUIL'
if sys.platform == 'darwin': if sys.platform == 'darwin':
obj.uselib += ' AUDIOUNITS OSX' obj.uselib += ' AUDIOUNITS OSX'

2
libs/fst/wscript
View File

@ -75,7 +75,7 @@ def build(bld):
obj.linkflags = ['-mwindows'] obj.linkflags = ['-mwindows']
obj.use = [ 'libpbd', 'vstwin' ] obj.use = [ 'libpbd', 'vstwin' ]
else: else:
obj.uselib = ['GIOMM', 'DL', 'OSX'] obj.uselib = ['GIOMM', 'DL', 'OSX', 'XML', 'ARCHIVE', 'CURL']
obj.use = [ 'libpbd' ] obj.use = [ 'libpbd' ]
obj.includes = [ '../pbd/', '../ardour/', '.' ] obj.includes = [ '../pbd/', '../ardour/', '.' ]

8
session_utils/wscript
View File

@ -55,10 +55,12 @@ def build_ardour_util(bld, util):
'PACKAGE="' + "ARDOURUTILS" + '"', 'PACKAGE="' + "ARDOURUTILS" + '"',
] ]
obj.install_path = bld.env['LIBDIR'] + '/utils' obj.install_path = bld.env['LIBDIR'] + '/utils'
obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL XML' obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GIOMM GTHREAD OGG CURL DL XML'
obj.uselib += ' FFTW3F'
obj.uselib += ' AUDIOUNITS OSX LO ' obj.uselib += ' AUDIOUNITS OSX LO '
obj.uselib += ' TAGLIB ' obj.uselib += ' FFTW3F LO TAGLIB LILV RUBBERBAND AUBIO LRDF ARCHIVE VAMPSDK VAMPHOSTSDK'
if bld.is_defined('HAVE_SUIL'):
obj.uselib += ' SUIL'
if sys.platform == 'darwin': if sys.platform == 'darwin':
obj.uselib += ' AUDIOUNITS OSX' obj.uselib += ' AUDIOUNITS OSX'

8
tools/luadevel/wscript
View File

@ -74,11 +74,13 @@ def build(bld):
'PACKAGE="' + "ARDOURUTILS" + '"', 'PACKAGE="' + "ARDOURUTILS" + '"',
] ]
obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL XML' obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GIOMM GTHREAD OGG CURL DL XML'
obj.uselib += ' FFTW3F'
obj.uselib += ' AUDIOUNITS OSX LO ' obj.uselib += ' AUDIOUNITS OSX LO '
obj.uselib += ' TAGLIB '
obj.uselib += ' READLINE ' obj.uselib += ' READLINE '
obj.uselib += ' FFTW3F LO TAGLIB LILV RUBBERBAND AUBIO LRDF ARCHIVE VAMPSDK VAMPHOSTSDK'
if bld.is_defined('HAVE_SUIL'):
obj.uselib += ' SUIL'
if sys.platform == 'darwin': if sys.platform == 'darwin':
obj.uselib += ' AUDIOUNITS OSX' obj.uselib += ' AUDIOUNITS OSX'