mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-02 13:59:59 +00:00
flatbuffers: upgrade 1.11.0 -> 1.12.0
0001-Add-detection-of-strtoull_l-function.patch removed since it is included in 1.12.0 Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
-38
@@ -1,38 +0,0 @@
|
|||||||
From bff7ffbc5130cd46caf33b76b4bb0593fcd15066 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Vladimir Glavnyy <31897320+vglavnyy@users.noreply.github.com>
|
|
||||||
Date: Fri, 10 May 2019 00:15:29 +0700
|
|
||||||
Subject: [PATCH] Add detection of strtoull_l function (#5333) (#5337)
|
|
||||||
|
|
||||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
||||||
[Retrieved from:
|
|
||||||
https://github.com/google/flatbuffers/commit/bff7ffbc5130cd46caf33b76b4bb0593fcd15066]
|
|
||||||
---
|
|
||||||
CMakeLists.txt | 12 +++++++++---
|
|
||||||
1 file changed, 9 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index 0640c37b5..30be238fe 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -42,12 +42,18 @@ if(DEFINED FLATBUFFERS_MAX_PARSING_DEPTH)
|
|
||||||
message(STATUS "FLATBUFFERS_MAX_PARSING_DEPTH: ${FLATBUFFERS_MAX_PARSING_DEPTH}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
-# Auto-detect locale-narrow 'strtod_l' function.
|
|
||||||
+# Auto-detect locale-narrow 'strtod_l' and 'strtoull_l' functions.
|
|
||||||
if(NOT DEFINED FLATBUFFERS_LOCALE_INDEPENDENT)
|
|
||||||
+ set(FLATBUFFERS_LOCALE_INDEPENDENT 0)
|
|
||||||
if(MSVC)
|
|
||||||
- check_cxx_symbol_exists(_strtof_l stdlib.h FLATBUFFERS_LOCALE_INDEPENDENT)
|
|
||||||
+ check_cxx_symbol_exists(_strtof_l stdlib.h FLATBUFFERS_HAS_STRTOF_L)
|
|
||||||
+ check_cxx_symbol_exists(_strtoui64_l stdlib.h FLATBUFFERS_HAS_STRTOULL_L)
|
|
||||||
else()
|
|
||||||
- check_cxx_symbol_exists(strtof_l stdlib.h FLATBUFFERS_LOCALE_INDEPENDENT)
|
|
||||||
+ check_cxx_symbol_exists(strtof_l stdlib.h FLATBUFFERS_HAS_STRTOF_L)
|
|
||||||
+ check_cxx_symbol_exists(strtoull_l stdlib.h FLATBUFFERS_HAS_STRTOULL_L)
|
|
||||||
+ endif()
|
|
||||||
+ if(FLATBUFFERS_HAS_STRTOF_L AND FLATBUFFERS_HAS_STRTOULL_L)
|
|
||||||
+ set(FLATBUFFERS_LOCALE_INDEPENDENT 1)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
add_definitions(-DFLATBUFFERS_LOCALE_INDEPENDENT=$<BOOL:${FLATBUFFERS_LOCALE_INDEPENDENT}>)
|
|
||||||
+3
-5
@@ -8,13 +8,11 @@ PACKAGE_BEFORE_PN = "${PN}-compiler"
|
|||||||
RDEPENDS_${PN}-compiler = "${PN}"
|
RDEPENDS_${PN}-compiler = "${PN}"
|
||||||
RDEPENDS_${PN}-dev += "${PN}-compiler"
|
RDEPENDS_${PN}-dev += "${PN}-compiler"
|
||||||
|
|
||||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a873c5645c184d51e0f9b34e1d7cf559"
|
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
|
||||||
|
|
||||||
SRCREV = "9e7e8cbe9f675123dd41b7c62868acad39188cae"
|
SRCREV = "6df40a2471737b27271bdd9b900ab5f3aec746c7"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/google/flatbuffers.git \
|
SRC_URI = "git://github.com/google/flatbuffers.git"
|
||||||
file://0001-Add-detection-of-strtoull_l-function.patch \
|
|
||||||
"
|
|
||||||
|
|
||||||
# Make sure C++11 is used, required for example for GCC 4.9
|
# Make sure C++11 is used, required for example for GCC 4.9
|
||||||
CXXFLAGS += "-std=c++11 -fPIC"
|
CXXFLAGS += "-std=c++11 -fPIC"
|
||||||
Reference in New Issue
Block a user