diff options
| author | fanquake <fanquake@gmail.com> | 2020-12-04 22:11:27 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2020-12-04 22:13:22 +0800 |
| commit | 9601c0d7aab771d3bfbab1cf7b988ee4ccf5132c (patch) | |
| tree | 90fef2f57531d7c3d2cbf0d329e39b13c5956f89 | |
| parent | dca80ffb45fcc8e6eedb6dc481d500dedab4248b (diff) | |
| parent | e373959d6fe90cc4507024a6b31a706bfc5bd0c8 (diff) | |
Merge #20565: Android : Ensure pic build for bdb
e373959d6fe90cc4507024a6b31a706bfc5bd0c8 Android : Ensure pic build for bdb (Block Mechanic)
Pull request description:
This pr ensures android builds for the BDB dependency have the pic flag enabled. Android builds were failing to link with reloc errors.
ACKs for top commit:
laanwj:
Code review ACK e373959d6fe90cc4507024a6b31a706bfc5bd0c8
jonasschnelli:
utACK e373959d6fe90cc4507024a6b31a706bfc5bd0c8
Tree-SHA512: 68319ed7cc0bd295eaa87dd53ba051daeb1456bc3ab9b48ca0c4b831a9c8da1073480478efde73689f0e403e37409a8459229264656f05ba5fef6c257a74f977
| -rw-r--r-- | depends/packages/bdb.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/depends/packages/bdb.mk b/depends/packages/bdb.mk index 9e533cc61b..d45ac3d03f 100644 --- a/depends/packages/bdb.mk +++ b/depends/packages/bdb.mk @@ -10,6 +10,7 @@ define $(package)_set_vars $(package)_config_opts=--disable-shared --enable-cxx --disable-replication --enable-option-checking $(package)_config_opts_mingw32=--enable-mingw $(package)_config_opts_linux=--with-pic +$(package)_config_opts_android=--with-pic $(package)_cflags+=-Wno-error=implicit-function-declaration $(package)_cxxflags=-std=c++17 $(package)_cppflags_mingw32=-DUNICODE -D_UNICODE |