Browse Source

Force fix for libdb mixed mode build

Signed-off-by: falkTX <falktx@falktx.com>
tags/v1.9.15
falkTX 5 years ago
parent
commit
a39d2df15e
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 8 additions and 1 deletions
  1. +6
    -0
      common/JackMetadata.h
  2. +2
    -1
      wscript

+ 6
- 0
common/JackMetadata.h View File

@@ -24,6 +24,12 @@
#include "config.h" #include "config.h"
#endif #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> #include <stdint.h>


#if HAVE_DB #if HAVE_DB


+ 2
- 1
wscript View File

@@ -392,8 +392,9 @@ def configure(conf):


if Options.options.mixed: if Options.options.mixed:
conf.setenv(lib32, env=conf.env.derive()) conf.setenv(lib32, env=conf.env.derive())
conf.env.append_unique('CXXFLAGS', '-m32')
conf.env.append_unique('CFLAGS', '-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') conf.env.append_unique('LINKFLAGS', '-m32')
if Options.options.libdir32: if Options.options.libdir32:
conf.env['LIBDIR'] = Options.options.libdir32 conf.env['LIBDIR'] = Options.options.libdir32


Loading…
Cancel
Save