Fix build with C23 glibc while here Signed-off-by: Khem Raj <[email protected]> --- .../snort/snort3/0001-Fix-build-on-c23.patch | 43 +++++++++++++++++++ .../{snort3_3.9.1.0.bb => snort3_3.9.7.0.bb} | 8 ++-- 2 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 meta-networking/recipes-connectivity/snort/snort3/0001-Fix-build-on-c23.patch rename meta-networking/recipes-connectivity/snort/{snort3_3.9.1.0.bb => snort3_3.9.7.0.bb} (85%)
diff --git a/meta-networking/recipes-connectivity/snort/snort3/0001-Fix-build-on-c23.patch b/meta-networking/recipes-connectivity/snort/snort3/0001-Fix-build-on-c23.patch new file mode 100644 index 0000000000..884a4b8fe6 --- /dev/null +++ b/meta-networking/recipes-connectivity/snort/snort3/0001-Fix-build-on-c23.patch @@ -0,0 +1,43 @@ +From ae5566a7df4851bd47081ef0e00e2a0513b7f331 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Mon, 10 Nov 2025 19:41:16 -0800 +Subject: [PATCH] Fix build on c23 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +C23/glibc is now including once_init in stdlib.h + +https://patchwork.sourceware.org/project/glibc/patch/[email protected]/#213088 + +This is a name collision with the new C once_flag/call_once that +glibc exposes (via <stdlib.h>) and C++’s std::once_flag/std::call_once + +Upstream-Status: Submitted [https://github.com/snort3/snort3/pull/431] +Signed-off-by: Khem Raj <[email protected]> +--- + src/loggers/alert_fast.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/loggers/alert_fast.cc b/src/loggers/alert_fast.cc +index 7b5deab2..3f88bff6 100644 +--- a/src/loggers/alert_fast.cc ++++ b/src/loggers/alert_fast.cc +@@ -53,7 +53,7 @@ using namespace std; + #define FAST_BUF (4*K_BYTES) + + static THREAD_LOCAL TextLog* fast_log = nullptr; +-static once_flag init_flag; ++static std::once_flag init_flag; + + #define S_NAME "alert_fast" + #define F_NAME S_NAME ".txt" +@@ -319,7 +319,7 @@ void FastLogger::set_buffer_ids(Inspector* gadget) + const BufferIds& FastLogger::get_buffer_ids(Inspector* gadget, Packet* p) + { + // lazy init required because loggers don't have a configure (yet) +- call_once(init_flag, set_buffer_ids, gadget); ++ std::call_once(init_flag, set_buffer_ids, gadget); + + InspectionBuffer buf; + const std::vector<unsigned>& idv = diff --git a/meta-networking/recipes-connectivity/snort/snort3_3.9.1.0.bb b/meta-networking/recipes-connectivity/snort/snort3_3.9.7.0.bb similarity index 85% rename from meta-networking/recipes-connectivity/snort/snort3_3.9.1.0.bb rename to meta-networking/recipes-connectivity/snort/snort3_3.9.7.0.bb index 598b1f4dfb..64a63ce918 100644 --- a/meta-networking/recipes-connectivity/snort/snort3_3.9.1.0.bb +++ b/meta-networking/recipes-connectivity/snort/snort3_3.9.7.0.bb @@ -7,11 +7,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=78fa8ef966b48fbf9095e13cc92377c5" DEPENDS = "flex-native hwloc libdaq libdnet libpcap libpcre libtirpc libunwind luajit zlib" -SRC_URI = "git://github.com/snort3/snort3.git;protocol=https;branch=master \ +SRC_URI = "git://github.com/snort3/snort3.git;protocol=https;branch=master;tag=${PV} \ file://0001-cmake-Check-for-HP-libunwind.patch \ - file://0001-cmake-Pass-noline-flag-to-flex.patch" + file://0001-cmake-Pass-noline-flag-to-flex.patch \ + file://0001-Fix-build-on-c23.patch \ + " -SRCREV = "6730d53f99f3714654804d07203f33e6b1b8a107" +SRCREV = "892f9f3b04d604797851d60e89d6cfe640a047cd" PACKAGES =+ "${PN}-scripts"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#121476): https://lists.openembedded.org/g/openembedded-devel/message/121476 Mute This Topic: https://lists.openembedded.org/mt/116234054/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
