1From 0315cef04a5a8a953072691faa48af9acb6009bd Mon Sep 17 00:00:00 2001 2From: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3Date: Tue, 10 Aug 2021 13:39:58 +0200 4Subject: [PATCH] include/flatbuffers/base.h: fix build on musl 5 6Build of applications using flatbuffers such as snort3 are broken on 7musl since version 1.11.0 and 8https://github.com/google/flatbuffers/commit/5f32f948102e65eaeea461b44f3b43f96c7a7a5a 9because strtoll_l (and strtoull_l) are not available on musl. 10flatbuffers checks for the availability of strtoull_l in CMakeLists.txt 11so flatbuffers builds successfully but for applications using 12flatbuffers, the result of this check is not available and 13FLATBUFFERS_LOCALE_INDEPENDENT is set to 1 resulting in the following 14build failure: 15 16In file included from /tmp/instance-0/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/include/flatbuffers/flexbuffers.h:24, 17 from /tmp/instance-0/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/include/flatbuffers/idl.h:26, 18 from /tmp/instance-0/output-1/build/snort3-3.1.6.0/src/network_inspectors/perf_monitor/fbs_formatter.cc:29: 19/tmp/instance-0/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/include/flatbuffers/util.h: In function 'void flatbuffers::strtoval_impl(int64_t*, const char*, char**, int)': 20/tmp/instance-0/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/include/flatbuffers/util.h:258:12: error: 'strtoll_l' was not declared in this scope; did you mean 'strcoll_l'? 21 258 | *val = __strtoll_impl(str, endptr, base); 22 | ^~~~~~~~~~~~~~ 23 24Fix this failure by checking if __GNUC__ is defined before setting 25FLATBUFFERS_LOCALE_INDEPENDENT to 1. 26 27Fixes: 28 - http://autobuild.buildroot.org/results/68045b83e94f8caa337b1af7ed5f493ac1a55c47 29 30Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 31[Upstream status: Rejected: 32 https://github.com/google/flatbuffers/pull/6773] 33Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> 34(rebased and added fix for uClibc-build) 35--- 36 include/flatbuffers/base.h | 2 +- 37 1 file changed, 1 insertion(+), 1 deletion(-) 38 39diff --git a/include/flatbuffers/base.h b/include/flatbuffers/base.h 40index de7898dc..101c7598 100644 41--- a/include/flatbuffers/base.h 42+++ b/include/flatbuffers/base.h 43@@ -264,7 +264,8 @@ namespace flatbuffers { 44 // strtoull_l}. 45 #if (defined(_MSC_VER) && _MSC_VER >= 1800) || \ 46 (defined(__ANDROID_API__) && __ANDROID_API__>= 21) || \ 47- (defined(_XOPEN_VERSION) && (_XOPEN_VERSION >= 700)) && \ 48+ (defined(_XOPEN_VERSION) && (_XOPEN_VERSION >= 700) && \ 49+ defined(__GLIBC__) && !defined(__UCLIBC__)) && \ 50 (!defined(__Fuchsia__) && !defined(__ANDROID_API__)) 51 #define FLATBUFFERS_LOCALE_INDEPENDENT 1 52 #else 53-- 542.30.2 55 56