Merge pull request #2767 from lrusak/gcc-14

[cmake] bdb53: disable error for implicit-int with gcc
gridcoin-community · Jun 16, 2024 · a3dafe6 · a3dafe6
2 parents 7b065d7 + 4e23a4f
commit a3dafe6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/configure.ac b/configure.ac
@@ -1418,7 +1418,7 @@ esac
 AC_CONFIG_SUBDIRS([src/univalue])
 AC_CONFIG_SUBDIRS([src/secp256k1])
 if test "$enable_embedded_bdb" = "yes"; then
-  AX_SUBDIRS_CONFIGURE([src/bdb53], [[CFLAGS="-Wno-error=implicit-function-declaration"], [CXXFLAGS="-Wno-error=implicit-function-declaration"], [--disable-java], [--disable-jdbc], [--disable-replication], [--enable-cxx], [$ADDITIONAL_BDB_FLAGS]], [], [], [])
+  AX_SUBDIRS_CONFIGURE([src/bdb53], [[CFLAGS=-Wno-error=implicit-function-declaration -Wno-error=implicit-int], [CXXFLAGS=-Wno-error=implicit-function-declaration -Wno-error=implicit-int], [--disable-java], [--disable-jdbc], [--disable-replication], [--enable-cxx], [$ADDITIONAL_BDB_FLAGS]], [], [], [])
 fi
 
 AC_OUTPUT

diff --git a/src/bdb53/CMakeLists.txt b/src/bdb53/CMakeLists.txt
@@ -34,7 +34,11 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         CFLAGS=-Wno-implicit-function-declaration
     )
 endif()
-
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+    list(APPEND BDB_FLAGS
+        CFLAGS=-Wno-error=implicit-int
+    )
+endif()
 
 # Make flags
 # ==========