diff options
| author | fanquake <fanquake@gmail.com> | 2023-05-01 14:31:43 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-05-01 14:32:08 +0100 |
| commit | 7b7636ead18fd006815d867aa580b34e3e70731e (patch) | |
| tree | c7033d33b912790b8b314a1b485e2d91beb4413b | |
| parent | 0567787f5ef9e45f96cb375dcd7e06117a9fd629 (diff) | |
| parent | f0919339bfd983975fe3b85f51423302a1d8a5a0 (diff) | |
| download | bitcoin-7b7636ead18fd006815d867aa580b34e3e70731e.tar.xz | |
Merge bitcoin/bitcoin#27475: [23.x] Additional backports for 23.x
f0919339bfd983975fe3b85f51423302a1d8a5a0 depends: fix compiling bdb with clang-16 on aarch64 (fanquake)
c14f3b3905211cf87f80ee320c580779411ad1aa bdb: disable Werror for format-security (fanquake)
ec7a8839a2b5313ad50b14605a9b1e227b290fd5 build: suppress array-bounds errors in libxkbcommon (fanquake)
Pull request description:
Any further backports for 23.x. Currently:
* 1bdbbbdc46c4e50bf07bc362e7e391ea1a53ea2f from https://github.com/bitcoin/bitcoin/pull/25436 - which fixes building QT in depends with GCC > 12.1
* https://github.com/bitcoin/bitcoin/pull/25763/
* https://github.com/bitcoin/bitcoin/pull/27462
ACKs for top commit:
TheCharlatan:
ACK f0919339bfd983975fe3b85f51423302a1d8a5a0
Tree-SHA512: 8432ae37906e347ed30e2adc99a8b51e7f44159d04244fa749c5666c3b27cdd4fa89394c41674f980c09cc6c11367c3ee9c0922a2a8bd65ea471f9fd71a108ad
| -rw-r--r-- | depends/packages/bdb.mk | 2 | ||||
| -rw-r--r-- | depends/packages/libxkbcommon.mk | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/depends/packages/bdb.mk b/depends/packages/bdb.mk index dc536fd399..62c462620b 100644 --- a/depends/packages/bdb.mk +++ b/depends/packages/bdb.mk @@ -14,7 +14,7 @@ $(package)_config_opts_freebsd=--with-pic $(package)_config_opts_netbsd=--with-pic $(package)_config_opts_openbsd=--with-pic $(package)_config_opts_android=--with-pic -$(package)_cflags+=-Wno-error=implicit-function-declaration +$(package)_cflags+=-Wno-error=implicit-function-declaration -Wno-error=format-security -Wno-error=implicit-int $(package)_cxxflags+=-std=c++17 $(package)_cppflags_mingw32=-DUNICODE -D_UNICODE endef diff --git a/depends/packages/libxkbcommon.mk b/depends/packages/libxkbcommon.mk index 8c6c56545f..bcdcf671f7 100644 --- a/depends/packages/libxkbcommon.mk +++ b/depends/packages/libxkbcommon.mk @@ -5,9 +5,14 @@ $(package)_file_name=$(package)-$($(package)_version).tar.xz $(package)_sha256_hash=60ddcff932b7fd352752d51a5c4f04f3d0403230a584df9a2e0d5ed87c486c8b $(package)_dependencies=libxcb +# This package explicitly enables -Werror=array-bounds, which causes build failures +# with GCC 12.1+. Work around that by turning errors back into warnings. +# This workaround would be dropped if the package was updated, as that would require +# a different build system (Meson) define $(package)_set_vars $(package)_config_opts = --enable-option-checking --disable-dependency-tracking $(package)_config_opts += --disable-static --disable-docs +$(package)_cflags += -Wno-error=array-bounds endef define $(package)_preprocess_cmds |