mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-19 16:40:46 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/flatbuffers: bump version to 2.0.8

Browse Source 
Updated patch 0001:
- updated upstream status to reflect its rejection
- rebased
- added fix for uClibc build, fixes non-locale kodi build:
  https://lists.buildroot.org/pipermail/buildroot/2022-August/648240.html

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Bernd Kuhls
2022-09-01 22:12:04 +02:00
committed by Thomas Petazzoni
parent 2471520c68
commit f8c8886f7b
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
package/flatbuffers/0001-include-flatbuffers-base.h-fix-build-on-musl.patch
View File

@@ -28,7 +28,10 @@ Fixes:
- http://autobuild.buildroot.org/results/68045b83e94f8caa337b1af7ed5f493ac1a55c47 - http://autobuild.buildroot.org/results/68045b83e94f8caa337b1af7ed5f493ac1a55c47
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/google/flatbuffers/pull/6773] [Upstream status: Rejected:
https://github.com/google/flatbuffers/pull/6773]
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
(rebased and added fix for uClibc-build)
--- ---
include/flatbuffers/base.h | 2 +- include/flatbuffers/base.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
@@ -37,15 +40,16 @@ diff --git a/include/flatbuffers/base.h b/include/flatbuffers/base.h
index de7898dc..101c7598 100644 index de7898dc..101c7598 100644
--- a/include/flatbuffers/base.h --- a/include/flatbuffers/base.h
+++ b/include/flatbuffers/base.h +++ b/include/flatbuffers/base.h
@@ -266,7 +266,7 @@ namespace flatbuffers { @@ -264,7 +264,8 @@ namespace flatbuffers {
#ifndef FLATBUFFERS_LOCALE_INDEPENDENT // strtoull_l}.
// Enable locale independent functions {strtof_l, strtod_l,strtoll_l, strtoull_l}. #if (defined(_MSC_VER) && _MSC_VER >= 1800) || \
#if ((defined(_MSC_VER) && _MSC_VER >= 1800) || \ (defined(__ANDROID_API__) && __ANDROID_API__>= 21) || \
- (defined(_XOPEN_VERSION) && (_XOPEN_VERSION>=700)) && (!defined(__ANDROID_API__) || (defined(__ANDROID_API__) && (__ANDROID_API__>=21)))) - (defined(_XOPEN_VERSION) && (_XOPEN_VERSION >= 700)) && \
+ (defined(__GLIBC__) && defined(_XOPEN_VERSION) && (_XOPEN_VERSION>=700)) && (!defined(__ANDROID_API__) || (defined(__ANDROID_API__) && (__ANDROID_API__>=21)))) + (defined(_XOPEN_VERSION) && (_XOPEN_VERSION >= 700) && \
+ defined(__GLIBC__) && !defined(__UCLIBC__)) && \
(!defined(__Fuchsia__) && !defined(__ANDROID_API__))
#define FLATBUFFERS_LOCALE_INDEPENDENT 1 #define FLATBUFFERS_LOCALE_INDEPENDENT 1
#else #else
#define FLATBUFFERS_LOCALE_INDEPENDENT 0
-- --
2.30.2 2.30.2

2
package/flatbuffers/flatbuffers.hash
View File

@@ -1,3 +1,3 @@
# Locally computed: # Locally computed:
sha256 e2dc24985a85b278dd06313481a9ca051d048f9474e0f199e372fea3ea4248c9 flatbuffers-2.0.6.tar.gz sha256 f97965a727d26386afaefff950badef2db3ab6af9afe23ed6d94bfb65f95f37e flatbuffers-2.0.8.tar.gz
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt

2
package/flatbuffers/flatbuffers.mk
View File

@@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
FLATBUFFERS_VERSION = 2.0.6 FLATBUFFERS_VERSION = 2.0.8
FLATBUFFERS_SITE = $(call github,google,flatbuffers,v$(FLATBUFFERS_VERSION)) FLATBUFFERS_SITE = $(call github,google,flatbuffers,v$(FLATBUFFERS_VERSION))
FLATBUFFERS_LICENSE = Apache-2.0 FLATBUFFERS_LICENSE = Apache-2.0
FLATBUFFERS_LICENSE_FILES = LICENSE.txt FLATBUFFERS_LICENSE_FILES = LICENSE.txt