diff --git a/packages/devel/rapidjson/package.mk b/packages/devel/rapidjson/package.mk index 0edcf120c1..51ed9f4aa8 100644 --- a/packages/devel/rapidjson/package.mk +++ b/packages/devel/rapidjson/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="rapidjson" -PKG_VERSION="1.0.2" +PKG_VERSION="1.1.0" PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/miloyip/rapidjson" @@ -30,8 +30,10 @@ PKG_LONGDESC="A fast JSON parser/generator for C++ with both SAX/DOM style API" PKG_IS_ADDON="no" PKG_AUTORECONF="no" -PKG_CMAKE_OPTS_TARGET="-DRAPIDJSON_HAS_STDSTRING=ON \ - -DRAPIDJSON_BUILD_DOC=OFF \ +PKG_CMAKE_OPTS_TARGET="-DRAPIDJSON_BUILD_DOC=OFF \ -DRAPIDJSON_BUILD_EXAMPLES=OFF -DRAPIDJSON_BUILD_TESTS=OFF \ - -DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF" + -DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF \ + -DRAPIDJSON_BUILD_ASAN=OFF \ + -DRAPIDJSON_BUILD_UBSAN=OFF \ + -DRAPIDJSON_HAS_STDSTRING=ON" diff --git a/packages/devel/rapidjson/patches/rapidjson-0001-remove_custom_cxx_flags.patch b/packages/devel/rapidjson/patches/rapidjson-0001-remove_custom_cxx_flags.patch index d15e861917..51434ff52e 100644 --- a/packages/devel/rapidjson/patches/rapidjson-0001-remove_custom_cxx_flags.patch +++ b/packages/devel/rapidjson/patches/rapidjson-0001-remove_custom_cxx_flags.patch @@ -1,18 +1,29 @@ -diff -rupN a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2015-09-10 18:33:21.048580591 +0200 -+++ b/CMakeLists.txt 2015-09-10 18:34:19.136579486 +0200 -@@ -25,14 +25,6 @@ if(RAPIDJSON_HAS_STDSTRING) - add_definitions(-DRAPIDJSON_HAS_STDSTRING) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ceda71b..efb259e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -50,7 +50,6 @@ if(CCACHE_FOUND) + endif(CCACHE_FOUND) + + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra -Werror") + if (RAPIDJSON_BUILD_CXX11) + if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7.0") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") +@@ -73,7 +72,6 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + endif() + endif() + elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra -Werror -Wno-missing-field-initializers") + if (RAPIDJSON_BUILD_CXX11) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + endif() +@@ -88,7 +86,6 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") + endif() + endif() + elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") +- add_definitions(-D_CRT_SECURE_NO_WARNINGS=1) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc") endif() --if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra") --elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra") --elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") -- add_definitions(-D_CRT_SECURE_NO_WARNINGS=1) --endif() -- - #add extra search paths for libraries and includes - SET(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The directory the headers are installed in") - SET(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE STRING "Directory where lib will install") +