From 28dd862c927f3791b6e7e8409b6c3d02a28eb6ee Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 18 Mar 2020 00:19:49 -0700 Subject: [PATCH] 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 Signed-off-by: Khem Raj --- ...Add-detection-of-strtoull_l-function.patch | 38 ------------------- ...uffers_1.11.0.bb => flatbuffers_1.12.0.bb} | 8 ++-- 2 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 meta-oe/recipes-devtools/flatbuffers/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch rename meta-oe/recipes-devtools/flatbuffers/{flatbuffers_1.11.0.bb => flatbuffers_1.12.0.bb} (72%) 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 deleted file mode 100644 index f3e82101bb..0000000000 --- a/meta-oe/recipes-devtools/flatbuffers/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch +++ /dev/null @@ -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 -[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=$) diff --git a/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.11.0.bb b/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb similarity index 72% rename from meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.11.0.bb rename to meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb index 529441de10..c31cef63cf 100644 --- a/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.11.0.bb +++ b/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb @@ -8,13 +8,11 @@ PACKAGE_BEFORE_PN = "${PN}-compiler" RDEPENDS_${PN}-compiler = "${PN}" 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 \ - file://0001-Add-detection-of-strtoull_l-function.patch \ - " +SRC_URI = "git://github.com/google/flatbuffers.git" # Make sure C++11 is used, required for example for GCC 4.9 CXXFLAGS += "-std=c++11 -fPIC"