LADI
/
jackdbus
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Force fix for libdb mixed mode build 

Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2019-12-03 12:31:06 +00:00
parent 1b10d4c888
commit a39d2df15e
No known key found for this signature in database
GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/JackMetadata.h
View File

@ -24,6 +24,12 @@
#include "config.h"
#endif
// libdb does not work in 32bit mixed mode
#ifdef BUILD_WITH_32_64
#undef HAVE_DB
#define HAVE_DB 0
#endif
#include <stdint.h>
#if HAVE_DB

3
wscript
View File

@ -392,8 +392,9 @@ def configure(conf):
if Options.options.mixed:
conf.setenv(lib32, env=conf.env.derive())
conf.env.append_unique('CXXFLAGS', '-m32')
conf.env.append_unique('CFLAGS', '-m32')
conf.env.append_unique('CXXFLAGS', '-m32')
conf.env.append_unique('CXXFLAGS', '-DBUILD_WITH_32_64')
conf.env.append_unique('LINKFLAGS', '-m32')
if Options.options.libdir32:
conf.env['LIBDIR'] = Options.options.libdir32