aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCory Fields <[email protected]>2016-01-05 16:27:42 -0500
committerCory Fields <[email protected]>2016-01-05 17:17:29 -0500
commit3968922b9623af9da9959adc49a779d6837e1f0c (patch)
tree3c0f10eaf55656dcf38442ea1b57f79306c9f914
parentc++11: CAccountingEntry must be defined before use in a list (diff)
downloaddiscoin-3968922b9623af9da9959adc49a779d6837e1f0c.tar.xz
discoin-3968922b9623af9da9959adc49a779d6837e1f0c.zip
c++11: fix libbdb build against libc++ in c++11 mode
atomic_init clashes with
-rw-r--r--depends/packages/bdb.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/depends/packages/bdb.mk b/depends/packages/bdb.mk
index 68841afdb..e2f85ad4f 100644
--- a/depends/packages/bdb.mk
+++ b/depends/packages/bdb.mk
@@ -12,7 +12,8 @@ $(package)_config_opts_linux=--with-pic
endef
define $(package)_preprocess_cmds
- sed -i.old 's/__atomic_compare_exchange/__atomic_compare_exchange_db/' dbinc/atomic.h
+ sed -i.old 's/__atomic_compare_exchange/__atomic_compare_exchange_db/' dbinc/atomic.h && \
+ sed -i.old 's/atomic_init/atomic_init_db/' dbinc/atomic.h mp/mp_region.c mp/mp_mvcc.c mp/mp_fget.c mutex/mut_method.c mutex/mut_tas.c
endef
define $(package)_config_cmds