proxysql: fix build by adjusting for gcc 15

Assisted-by: Claude Opus 5
This commit is contained in:
6543
2026-07-27 23:06:24 +02:00
parent 100b3da436
commit 7c9566751b
3 changed files with 18 additions and 1 deletions
@@ -0,0 +1,16 @@
The vendored copy of Google's cpp-btree relies on <cstdint> being pulled in
transitively. libstdc++ 15 no longer does so, which makes uint8_t/uint16_t
undeclared, and the resulting fallback to int trips the kNodeValues
COMPILE_ASSERT with a "1 << 32" shift.
diff --git a/include/btree.h b/include/btree.h
--- a/include/btree.h
+++ b/include/btree.h
@@ -104,6 +104,7 @@
#include <stddef.h>
#include <string.h>
#include <sys/types.h>
+#include <cstdint>
#include <algorithm>
#include <functional>
#include <iostream>
+1 -1
View File
@@ -151,7 +151,7 @@ index 87d2a20e..505e069a 100644
cd mariadb-client-library && tar -zxf mariadb-connector-c-3.3.8-src.tar.gz
cd mariadb-client-library/mariadb_client && patch -p0 < ../plugin_auth_CMakeLists.txt.patch
- cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(SSL_IDIR) -DOPENSSL_LIBRARIES=$(SSL_LDIR) -DICONV_LIBRARIES=$(brew --prefix libiconv)/lib -DICONV_INCLUDE=$(brew --prefix libiconv)/include .
+ cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(SSL_IDIR) -DOPENSSL_LIBRARIES=$(SSL_LDIR) -DICONV_LIBRARIES=$(brew --prefix libiconv)/lib -DICONV_INCLUDE=$(brew --prefix libiconv)/include .
+ cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_C_FLAGS=-std=gnu17 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(SSL_IDIR) -DOPENSSL_LIBRARIES=$(SSL_LDIR) -DICONV_LIBRARIES=$(brew --prefix libiconv)/lib -DICONV_INCLUDE=$(brew --prefix libiconv)/include .
ifeq ($(PROXYDEBUG),1)
cd mariadb-client-library/mariadb_client && patch -p0 < ../ma_context.h.patch
else ifeq ($(USEVALGRIND),1)
+1
View File
@@ -49,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
./makefiles.patch
./dont-phone-home.patch
./btree-cstdint.patch
];
nativeBuildInputs = [