This is an automated email from the ASF dual-hosted git repository.
martinzink pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/main by this push:
new e0b8c97bb MINIFICPP-2918 Fix conan build of m4 library with GCC 15
(#2277)
e0b8c97bb is described below
commit e0b8c97bb36cf70fa906e725d774fa67666de7fc
Author: Gabor Gyimesi <[email protected]>
AuthorDate: Wed Oct 7 13:20:18 2026 +0200
MINIFICPP-2918 Fix conan build of m4 library with GCC 15 (#2277)
---
bootstrap/cli.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/bootstrap/cli.py b/bootstrap/cli.py
index 5ed8ebcd3..1c6eeb326 100644
--- a/bootstrap/cli.py
+++ b/bootstrap/cli.py
@@ -134,9 +134,10 @@ def run_conan_install(minifi_options: MinifiOptions,
package_manager: PackageMan
" -c \"civetweb/*:tools.build:defines=['SOCKET_TIMEOUT_QUANTUM=200']\""
" -c
\"civetweb/*:tools.info.package_id:confs=['tools.build:defines']\""
)
+ m4_conf = " -c:b \"m4/*:tools.build:cflags=['-std=gnu17']\""
build_cmd = (
f'conan install "{minifi_options.source_dir}"
--output-folder="{minifi_options.build_dir}" --build=missing {conan_options} '
-
f"--settings=build_type={minifi_options.build_type.value}{generator_setting}{compiler_settings}{civetweb_conf}"
+
f"--settings=build_type={minifi_options.build_type.value}{generator_setting}{compiler_settings}{civetweb_conf}{m4_conf}"
)
if platform.system() == "Linux":
# Conan's prebuilt m4 binary fails autom4te's version probe in some
Linux build containers (e.g. RockyLinux 8), so always build m4 from source on
Linux.
