diff options
Diffstat (limited to 'meta-oe/recipes-devtools/flatbuffers')
-rw-r--r-- | meta-oe/recipes-devtools/flatbuffers/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch | 38 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.11.0.bb (renamed from meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.10.0.bb) | 6 |
2 files changed, 42 insertions, 2 deletions
diff --git a/meta-oe/recipes-devtools/flatbuffers/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch b/meta-oe/recipes-devtools/flatbuffers/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch new file mode 100644 index 0000000000..f3e82101bb --- /dev/null +++ b/meta-oe/recipes-devtools/flatbuffers/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch @@ -0,0 +1,38 @@ +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}>) diff --git a/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.10.0.bb b/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.11.0.bb index 452e1e65ab..bd6dcef4e3 100644 --- a/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.10.0.bb +++ b/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.11.0.bb @@ -10,9 +10,11 @@ RDEPENDS_${PN}-dev += "${PN}-compiler" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a873c5645c184d51e0f9b34e1d7cf559" -SRCREV = "c0698cc33f1e534bb59c455909b88cc2726089af" +SRCREV = "9e7e8cbe9f675123dd41b7c62868acad39188cae" -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 CXXFLAGS += "-std=c++11" |