Fix cross-compile linking (arm-linux ld)
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:
parent
72bf12219e
commit
5794d21a76
@ -641,7 +641,7 @@ def build(bld):
|
||||
]
|
||||
obj.install_path = bld.env['DLLDIR']
|
||||
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':
|
||||
obj.uselib += ' AUDIOUNITS OSX '
|
||||
|
@ -58,10 +58,12 @@ def build(bld):
|
||||
'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
|
||||
]
|
||||
obj.install_path = bld.env['LIBDIR']
|
||||
obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL XML'
|
||||
obj.uselib += ' FFTW3F'
|
||||
obj.uselib += ' AUDIOUNITS OSX LO '
|
||||
obj.uselib += ' TAGLIB '
|
||||
obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GIOMM GTHREAD OGG CURL DL XML'
|
||||
obj.uselib += ' AUDIOUNITS OSX'
|
||||
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':
|
||||
obj.uselib += ' AUDIOUNITS OSX'
|
||||
|
@ -75,7 +75,7 @@ def build(bld):
|
||||
obj.linkflags = ['-mwindows']
|
||||
obj.use = [ 'libpbd', 'vstwin' ]
|
||||
else:
|
||||
obj.uselib = ['GIOMM', 'DL', 'OSX']
|
||||
obj.uselib = ['GIOMM', 'DL', 'OSX', 'XML', 'ARCHIVE', 'CURL']
|
||||
obj.use = [ 'libpbd' ]
|
||||
|
||||
obj.includes = [ '../pbd/', '../ardour/', '.' ]
|
||||
|
@ -55,10 +55,12 @@ def build_ardour_util(bld, util):
|
||||
'PACKAGE="' + "ARDOURUTILS" + '"',
|
||||
]
|
||||
obj.install_path = bld.env['LIBDIR'] + '/utils'
|
||||
obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL XML'
|
||||
obj.uselib += ' FFTW3F'
|
||||
obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GIOMM GTHREAD OGG CURL DL XML'
|
||||
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':
|
||||
obj.uselib += ' AUDIOUNITS OSX'
|
||||
|
@ -74,11 +74,13 @@ def build(bld):
|
||||
'PACKAGE="' + "ARDOURUTILS" + '"',
|
||||
]
|
||||
|
||||
obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL XML'
|
||||
obj.uselib += ' FFTW3F'
|
||||
obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GIOMM GTHREAD OGG CURL DL XML'
|
||||
obj.uselib += ' AUDIOUNITS OSX LO '
|
||||
obj.uselib += ' TAGLIB '
|
||||
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':
|
||||
obj.uselib += ' AUDIOUNITS OSX'
|
||||
|
Loading…
Reference in New Issue
Block a user