From 0d48a392d56d6ec9ef0de267f7ee802b3daae8b0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 19 Mar 2017 22:31:38 -0700 Subject: rapidjson: Update to 1.1.0 + git Drop backports Adjust the license checksums to match the changes to file especially https://github.com/miloyip/rapidjson/commit/b4b1a39937fbd168ef72ea477f90f626773d56fc Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- .../Fix-gcc-strict-overflow-warning.patch | 30 ---------------- .../remove-march-native-from-CMAKE_CXX_FLAGS.patch | 41 +++++++++++++--------- .../recipes-devtools/rapidjson/rapidjson_1.0.2.bb | 24 ------------- .../recipes-devtools/rapidjson/rapidjson_git.bb | 25 +++++++++++++ 4 files changed, 49 insertions(+), 71 deletions(-) delete mode 100644 meta-oe/recipes-devtools/rapidjson/rapidjson/Fix-gcc-strict-overflow-warning.patch delete mode 100644 meta-oe/recipes-devtools/rapidjson/rapidjson_1.0.2.bb create mode 100644 meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb (limited to 'meta-oe/recipes-devtools/rapidjson') diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson/Fix-gcc-strict-overflow-warning.patch b/meta-oe/recipes-devtools/rapidjson/rapidjson/Fix-gcc-strict-overflow-warning.patch deleted file mode 100644 index 6ce3933cea..0000000000 --- a/meta-oe/recipes-devtools/rapidjson/rapidjson/Fix-gcc-strict-overflow-warning.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f5560d9557ee48fb79810180ddfd3ec386e2a7b5 Mon Sep 17 00:00:00 2001 -From: Milo Yip -Date: Wed, 2 Mar 2016 01:01:17 +0800 -Subject: [PATCH] Fix gcc strict-overflow warning - -Fix #566 #568 - -Upstream-Status: Backport [Partial merge of upstream commit 928caf92e] - -Signed-off-by: Andre McCurdy ---- - include/rapidjson/internal/dtoa.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/rapidjson/internal/dtoa.h b/include/rapidjson/internal/dtoa.h -index 2d8d2e4..15571e1 100644 ---- a/include/rapidjson/internal/dtoa.h -+++ b/include/rapidjson/internal/dtoa.h -@@ -148,7 +148,7 @@ inline char* WriteExponent(int K, char* buffer) { - inline char* Prettify(char* buffer, int length, int k) { - const int kk = length + k; // 10^(kk-1) <= v < 10^kk - -- if (length <= kk && kk <= 21) { -+ if (0 <= k && kk <= 21) { - // 1234e7 -> 12340000000 - for (int i = length; i < kk; i++) - buffer[i] = '0'; --- -1.9.1 - diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch b/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch index 17164283ce..cf3e16ea5d 100644 --- a/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch +++ b/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch @@ -12,22 +12,29 @@ Signed-off-by: Andre McCurdy CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 68139ba..cae7c9b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -26,9 +26,9 @@ if(RAPIDJSON_HAS_STDSTRING) - endif() +Index: git/CMakeLists.txt +=================================================================== +--- git.orig/CMakeLists.txt ++++ git/CMakeLists.txt +@@ -51,10 +51,10 @@ endif(CCACHE_FOUND) if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra") - elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra") - elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") - add_definitions(-D_CRT_SECURE_NO_WARNINGS=1) - endif() --- -1.9.1 - + if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "powerpc" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64le") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + else() + #FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER. +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + endif() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror") + set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wsign-conversion) +@@ -84,7 +84,7 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "C + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native") + else() + #FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER. +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + endif() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Wno-missing-field-initializers") + set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wimplicit-fallthrough -Weverything) diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson_1.0.2.bb b/meta-oe/recipes-devtools/rapidjson/rapidjson_1.0.2.bb deleted file mode 100644 index dd6b896981..0000000000 --- a/meta-oe/recipes-devtools/rapidjson/rapidjson_1.0.2.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "A fast JSON parser/generator for C++ with both SAX/DOM style API" -HOMEPAGE = "http://rapidjson.org/" -SECTION = "libs" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://license.txt;md5=cff54e417a17b4b77465198254970cd2" - -SRC_URI = "git://github.com/miloyip/rapidjson.git;nobranch=1 \ - file://remove-march-native-from-CMAKE_CXX_FLAGS.patch \ - file://Fix-gcc-strict-overflow-warning.patch \ -" - -SRCREV = "3d5848a7cd3367c5cb451c6493165b7745948308" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF" - -# RapidJSON is a header-only C++ library, so the main package will be empty. - -FILES_${PN}-dev += "${libdir}/cmake" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb new file mode 100644 index 0000000000..4cded07201 --- /dev/null +++ b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb @@ -0,0 +1,25 @@ +SUMMARY = "A fast JSON parser/generator for C++ with both SAX/DOM style API" +HOMEPAGE = "http://rapidjson.org/" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://license.txt;md5=ba04aa8f65de1396a7e59d1d746c2125" + +SRC_URI = "git://github.com/miloyip/rapidjson.git;nobranch=1 \ + file://remove-march-native-from-CMAKE_CXX_FLAGS.patch \ +" + +SRCREV = "e5635fb27feab7f6e8d7b916aa20ad799045a641" + +PV = "1.1.0+git${SRCPV}" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF" + +# RapidJSON is a header-only C++ library, so the main package will be empty. + +FILES_${PN}-dev += "${libdir}/cmake" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf