diff options
| author | fanquake <fanquake@gmail.com> | 2024-02-26 11:30:43 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2024-02-26 11:30:50 +0000 |
| commit | ac19235818e220108cf44932194af12ef6e1be8b (patch) | |
| tree | f2a69e39e5378208ea9fa5953013e5fb17ea431c | |
| parent | 19b7f2b908aec5a95adf7a27292feb0a429a033d (diff) | |
| parent | 0fbf051fec723f86f49ab14ea15c91bb1435c656 (diff) | |
| download | bitcoin-ac19235818e220108cf44932194af12ef6e1be8b.tar.xz | |
Merge bitcoin/bitcoin#29443: depends: fix BDB compilation on OpenBSD
0fbf051fec723f86f49ab14ea15c91bb1435c656 depends: fix BDB compilation on OpenBSD (Sebastian Falbesoner)
Pull request description:
Compiling C++ code with `-D_XOPEN_SOURCE=600` causes problems on OpenBSD. If that define is set, the C++ standard header detection routine in BDB's configure script fails due to a missing type name for `locale_t` (see https://gist.github.com/theStack/b41884e31ebc5cdca3220bcaa674cb70 for the relevant config.log part).
This results in `HAVE_CXX_STDHEADERS` not being defined, which then it turn leads to the inclusion of `<iostream.h>` (rather than `<iostream>`), which doesn't exist, as described in #28963.
According to a mailing list post discussing a similar problem [1], "OpenBSD provides the POSIX APIs by default", so we don't need this define anyway and can remove it. This fixes the BDB build problem as described in issue #28963. See also https://github.com/google/flatbuffers/pull/6205/commits/f87e75ae71a2301daf2ad59b180977fc30c6abe4 for a similar fix for google's flatbuffer project.
Tested on OpenBSD 7.4 with clang 13.0.0. Fixes #28963.
[1] https://www.mail-archive.com/tech@openbsd.org/msg63386.html
ACKs for top commit:
fanquake:
ACK 0fbf051fec723f86f49ab14ea15c91bb1435c656
Tree-SHA512: 02139e9081ed855e067bfba8c81b54c657417576e553cc1035a916ada9be049358f5e14d756d5f234c5226bd7e943f61c6ae8990c1b152f9125681b7b777c9b3
| -rw-r--r-- | depends/packages/bdb.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/depends/packages/bdb.mk b/depends/packages/bdb.mk index 9f5a925015..1a21238152 100644 --- a/depends/packages/bdb.mk +++ b/depends/packages/bdb.mk @@ -17,7 +17,6 @@ $(package)_config_opts_android=--with-pic $(package)_cflags+=-Wno-error=implicit-function-declaration -Wno-error=format-security -Wno-error=implicit-int $(package)_cppflags_freebsd=-D_XOPEN_SOURCE=600 -D__BSD_VISIBLE=1 $(package)_cppflags_netbsd=-D_XOPEN_SOURCE=600 -$(package)_cppflags_openbsd=-D_XOPEN_SOURCE=600 $(package)_cppflags_mingw32=-DUNICODE -D_UNICODE endef |