initial buildroot for linux 5.15
This commit is contained in:
Huan.Feng
@@ -0,0 +1,51 @@
|
||||
From 0315cef04a5a8a953072691faa48af9acb6009bd Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Tue, 10 Aug 2021 13:39:58 +0200
|
||||
Subject: [PATCH] include/flatbuffers/base.h: fix build on musl
|
||||
|
||||
Build of applications using flatbuffers such as snort3 are broken on
|
||||
musl since version 1.11.0 and
|
||||
https://github.com/google/flatbuffers/commit/5f32f948102e65eaeea461b44f3b43f96c7a7a5a
|
||||
because strtoll_l (and strtoull_l) are not available on musl.
|
||||
flatbuffers checks for the availability of strtoull_l in CMakeLists.txt
|
||||
so flatbuffers builds successfully but for applications using
|
||||
flatbuffers, the result of this check is not available and
|
||||
FLATBUFFERS_LOCALE_INDEPENDENT is set to 1 resulting in the following
|
||||
build failure:
|
||||
|
||||
In file included from /tmp/instance-0/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/include/flatbuffers/flexbuffers.h:24,
|
||||
from /tmp/instance-0/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/include/flatbuffers/idl.h:26,
|
||||
from /tmp/instance-0/output-1/build/snort3-3.1.6.0/src/network_inspectors/perf_monitor/fbs_formatter.cc:29:
|
||||
/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)':
|
||||
/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'?
|
||||
258 | *val = __strtoll_impl(str, endptr, base);
|
||||
| ^~~~~~~~~~~~~~
|
||||
|
||||
Fix this failure by checking if __GNUC__ is defined before setting
|
||||
FLATBUFFERS_LOCALE_INDEPENDENT to 1.
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/68045b83e94f8caa337b1af7ed5f493ac1a55c47
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/google/flatbuffers/pull/6773]
|
||||
---
|
||||
include/flatbuffers/base.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/flatbuffers/base.h b/include/flatbuffers/base.h
|
||||
index de7898dc..101c7598 100644
|
||||
--- a/include/flatbuffers/base.h
|
||||
+++ b/include/flatbuffers/base.h
|
||||
@@ -266,7 +266,7 @@ namespace flatbuffers {
|
||||
#ifndef FLATBUFFERS_LOCALE_INDEPENDENT
|
||||
// Enable locale independent functions {strtof_l, strtod_l,strtoll_l, strtoull_l}.
|
||||
#if ((defined(_MSC_VER) && _MSC_VER >= 1800) || \
|
||||
- (defined(_XOPEN_VERSION) && (_XOPEN_VERSION>=700)) && (!defined(__ANDROID_API__) || (defined(__ANDROID_API__) && (__ANDROID_API__>=21))))
|
||||
+ (defined(__GLIBC__) && defined(_XOPEN_VERSION) && (_XOPEN_VERSION>=700)) && (!defined(__ANDROID_API__) || (defined(__ANDROID_API__) && (__ANDROID_API__>=21))))
|
||||
#define FLATBUFFERS_LOCALE_INDEPENDENT 1
|
||||
#else
|
||||
#define FLATBUFFERS_LOCALE_INDEPENDENT 0
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
config BR2_PACKAGE_FLATBUFFERS
|
||||
bool "flatbuffers"
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
help
|
||||
FlatBuffers is an efficient cross platform serialization
|
||||
library for C++, C#, C, Go, Java, JavaScript, PHP, and
|
||||
Python. It was originally created at Google for game
|
||||
development and other performance-critical applications.
|
||||
|
||||
http://google.github.io/flatbuffers/
|
||||
|
||||
comment "flatbuffers needs a toolchain w/ C++, gcc >= 4.7"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
|
||||
@@ -0,0 +1,3 @@
|
||||
# Locally computed:
|
||||
sha256 9ddb9031798f4f8754d00fca2f1a68ecf9d0f83dfac7239af1311e4fd9a565c4 flatbuffers-2.0.0.tar.gz
|
||||
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt
|
||||
@@ -0,0 +1,34 @@
|
||||
################################################################################
|
||||
#
|
||||
# flatbuffers
|
||||
#
|
||||
################################################################################
|
||||
|
||||
FLATBUFFERS_VERSION = 2.0.0
|
||||
FLATBUFFERS_SITE = $(call github,google,flatbuffers,v$(FLATBUFFERS_VERSION))
|
||||
FLATBUFFERS_LICENSE = Apache-2.0
|
||||
FLATBUFFERS_LICENSE_FILES = LICENSE.txt
|
||||
FLATBUFFERS_CPE_ID_VENDOR = google
|
||||
FLATBUFFERS_INSTALL_STAGING = YES
|
||||
|
||||
FLATBUFFERS_CONF_OPTS += \
|
||||
-DCMAKE_CXX_FLAGS="-std=c++11" \
|
||||
-DFLATBUFFERS_BUILD_TESTS=OFF
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
FLATBUFFERS_CONF_OPTS += -DFLATBUFFERS_BUILD_SHAREDLIB=OFF
|
||||
else
|
||||
FLATBUFFERS_CONF_OPTS += -DFLATBUFFERS_BUILD_SHAREDLIB=ON
|
||||
endif
|
||||
|
||||
HOST_FLATBUFFERS_CONF_OPTS += \
|
||||
-DCMAKE_CXX_FLAGS="-std=c++11" \
|
||||
-DFLATBUFFERS_BUILD_FLATLIB=OFF \
|
||||
-DFLATBUFFERS_BUILD_FLATC=ON \
|
||||
-DFLATBUFFERS_BUILD_FLATHASH=OFF \
|
||||
-DFLATBUFFERS_BUILD_GRPCTEST=OFF \
|
||||
-DFLATBUFFERS_BUILD_SHAREDLIB=OFF \
|
||||
-DFLATBUFFERS_BUILD_TESTS=OFF
|
||||
|
||||
$(eval $(cmake-package))
|
||||
$(eval $(host-cmake-package))
|
||||
Reference in New Issue
Block a user