From 129160ec854dca4c3fedb5bcfbcb56930371da0f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 1 Jan 2021 21:06:00 +0000 Subject: gentoo new year resync : 01.01.2021 --- dev-libs/rapidjson/Manifest | 6 ++- .../files/rapidjson-1.1.0-system_gtest.patch | 44 ++++++++++++++++++ .../files/rapidjson-1.1.0-valgrind_optional.patch | 21 +++++++++ .../files/rapidjson-1.1.1-valgrind_optional.patch | 21 +++++++++ dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild | 54 ++++++++++++++++++++++ dev-libs/rapidjson/rapidjson-9999.ebuild | 18 +++++--- 6 files changed, 156 insertions(+), 8 deletions(-) create mode 100644 dev-libs/rapidjson/files/rapidjson-1.1.0-system_gtest.patch create mode 100644 dev-libs/rapidjson/files/rapidjson-1.1.0-valgrind_optional.patch create mode 100644 dev-libs/rapidjson/files/rapidjson-1.1.1-valgrind_optional.patch create mode 100644 dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild (limited to 'dev-libs/rapidjson') diff --git a/dev-libs/rapidjson/Manifest b/dev-libs/rapidjson/Manifest index 06743dad1a61..47cb8db700ec 100644 --- a/dev-libs/rapidjson/Manifest +++ b/dev-libs/rapidjson/Manifest @@ -1,7 +1,11 @@ AUX rapidjson-1.1.0-gcc-7.patch 1393 BLAKE2B 71affc72ebbf714788e243b75f9157e9423dcc34eb43efb3479125e2e269c6fcdcfc4d9e9334979b3f5463d97e241dfa3f335d893729282109ce6c768023ec92 SHA512 4f24f37a3c106698b871438675f2b06f2389d724ab8484a616586b5810aec5d8bd11eed759772affa627493314d3f47757af3a54519f3659df1d218cd12c3cd9 +AUX rapidjson-1.1.0-system_gtest.patch 1270 BLAKE2B f34691f9449dec16c1c1852cb02a0652db195901bdbb811e682ee3f012b58caf436a3a317b9459d3a4a74e6c267d8110b06996689bef0d019c247e91957bbbec SHA512 2ae498dae5e10503edff590b470cfaaecaac78cbdef15a03cd647e3bf6d1dbae286bf381383e2524ea1c8655f377a68df899f4204dd4c31b3414faa1444d18cb +AUX rapidjson-1.1.0-valgrind_optional.patch 814 BLAKE2B c12e3571050eb63da3e02eb025d0d79cfdca175168d8ad88d947cdf0ffd7b2bb7150563e6adc4f6f43c9e1513f7066e99ab41ffe151bf3503f2e279c1baff535 SHA512 edce6fa3433380487c321ba1b735f08c237d058abb59167b055985272acb83be863650141fcdca5c099b3f3b81f342531b8088e6ef66f71389f2d830b74074e1 +AUX rapidjson-1.1.1-valgrind_optional.patch 868 BLAKE2B 39e46efcd4ebea2f85b40531e46bfcf23eed894e93b6fe4cd8fcb7ac8c614d5e6e98c21c17304f3cf6c7c6415eadaa32b4c496f559f07fd56870820a027dc2c1 SHA512 a71016e4dc17d40afe18ea84c915ff52ce78a28c8e9a0d10342db34954993e2d65dbff7059c6683837334414c73ade934c805d0fa3d758358f7b236d1b57371d DIST rapidjson-1.1.0.tar.gz 1019402 BLAKE2B e1564b3cfa020f76437b0a35048a42ff2cd98b5ce285e63f228e158885182e5cecda13407cdf30c03fa39b47cbc579ff0065f6c2682d04b806e8f9ea8d36fc4e SHA512 2e82a4bddcd6c4669541f5945c2d240fb1b4fdd6e239200246d3dd50ce98733f0a4f6d3daa56f865d8c88779c036099c52a9ae85d47ad263686b68a88d832dff EBUILD rapidjson-1.1.0-r1.ebuild 1099 BLAKE2B 355d7cc8a583a2fe0ba2d033376f81d4f8cd6879461afdc03b6caf2ed947fedfd5eeb389cd546c0a978c66bdfa4be120e815140b1e0e9d9910fe4909af318430 SHA512 373409249dd5530a5619e1c5d7c29edea6246c1d238b820d98d058a0a1afdaa62311d8ea61ea99c02c971866fbdb626a8d9e68ceb78e18e1a5e1aa3d046e8f71 EBUILD rapidjson-1.1.0-r2.ebuild 1196 BLAKE2B e1f709ff94d5cf7cb1c581cce49415cc76e221f8a2134e5b7c3f2ececd39aa7ac86e945653e331523675c02ace4e1e2256221d700141815a83b61b8fc94ca01f SHA512 e4fab2177decc21c90598409eda202ca59ed4b2c8e99e920ec8ecab72c2a5f6aa30cbd3064af6ddd6f7e388f8523a61cb38d3ecfd63a6af02d59b3aeb02f1189 +EBUILD rapidjson-1.1.0-r3.ebuild 1337 BLAKE2B 1ab8905bb9168211eba005d25ca10401f823568120b859a72b7537eb4a3af4cdbf4a8821d8619552c3cd399510285af36becec2a121c3e890ac73f78fc2e3dbc SHA512 801a54f843b9ce7d5632c9da060b651b88987b9686c6bd74fec7a624ea7469c41e81c6f0439dd8ff4a2db6ed380eca994b66c2488f4706b0f086a3f8c2f40623 EBUILD rapidjson-1.1.0.ebuild 907 BLAKE2B 6d3d531856301c37083b50f0d9a2454b305df7f02e5fee3ba22b3063943afc726f976820fc8a081d77cca87b0f1081e37165962cb272d585dad73eae855c129b SHA512 d049d8687b714f5d12142da93ab170a2a9081f7a50181347c5b6ff1f5096eac40fd231fa65072f30db705b008130990d10f51d68ff7f9c2ac943c5829a2efbee -EBUILD rapidjson-9999.ebuild 1163 BLAKE2B 40c820e4a248819e0c9452d691d36900223da3ae76f86c83a90985e7f6ce923f07f7d8550d7fef1be1a280ddd9613e68ec53c80635fa9e0415ba74ce47c69659 SHA512 a4fade593c5943b556380f9c41f0d9a4ce0bb8b2c2ca1bf9f779af6de599c49e479ee7e6d04dc7c501be45c6257e24553b7206bf7fdff634283430b924f031c2 +EBUILD rapidjson-9999.ebuild 1341 BLAKE2B f985212651256604f3e2ef7c58581dbc21d95c4b2d53a25847a70403520956b30b87cc3d9d18d316004d8dbcce96b906aadb7bdb28a8b15e0d84f370bf500b6c SHA512 0c4b5c74f2510a8623e09a2b10a7e564ac1cda70875d061ef2a02e4fe0dfe219b8118295c1a996399e00a9919f2af4cdab77e2a100fbd492a6efd74280183302 MISC metadata.xml 395 BLAKE2B acf0adcc9af1a50757d72f4b52d73c2481fda7bb48ebf2b71e7440c81788e1633b45a4af9ee0adbc1984b0667207706d162e1bdb7177ce8f4e85b819f789b708 SHA512 678196ecc89abed8aa3c1699844573b78103f1ee77dd193b68ad1ae1d5518cd46469b0a5850b00a201c41be381c730ced2aec79f8d4230cf61419b3a20a88935 diff --git a/dev-libs/rapidjson/files/rapidjson-1.1.0-system_gtest.patch b/dev-libs/rapidjson/files/rapidjson-1.1.0-system_gtest.patch new file mode 100644 index 000000000000..bdc720e8cf86 --- /dev/null +++ b/dev-libs/rapidjson/files/rapidjson-1.1.0-system_gtest.patch @@ -0,0 +1,44 @@ +--- /CMakeModules/FindGTestSrc.cmake ++++ /CMakeModules/FindGTestSrc.cmake +@@ -1,30 +1,9 @@ +- +-SET(GTEST_SEARCH_PATH +- "${GTEST_SOURCE_DIR}" +- "${CMAKE_CURRENT_LIST_DIR}/../thirdparty/gtest/googletest") +- +-IF(UNIX) +- IF(RAPIDJSON_BUILD_THIRDPARTY_GTEST) +- LIST(APPEND GTEST_SEARCH_PATH "/usr/src/gtest") +- ELSE() +- LIST(INSERT GTEST_SEARCH_PATH 1 "/usr/src/gtest") +- ENDIF() +-ENDIF() +- +-FIND_PATH(GTEST_SOURCE_DIR +- NAMES CMakeLists.txt src/gtest_main.cc +- PATHS ${GTEST_SEARCH_PATH}) +- +- + # Debian installs gtest include directory in /usr/include, thus need to look + # for include directory separately from source directory. + FIND_PATH(GTEST_INCLUDE_DIR + NAMES gtest/gtest.h +- PATH_SUFFIXES include +- HINTS ${GTEST_SOURCE_DIR} +- PATHS ${GTEST_SEARCH_PATH}) ++ PATH_SUFFIXES include) + + INCLUDE(FindPackageHandleStandardArgs) + find_package_handle_standard_args(GTestSrc DEFAULT_MSG +- GTEST_SOURCE_DIR + GTEST_INCLUDE_DIR) +--- /test/CMakeLists.txt ++++ /test/CMakeLists.txt +@@ -8,7 +8,6 @@ + set(gtest_force_shared_crt ON) + endif() + +- add_subdirectory(${GTEST_SOURCE_DIR} ${CMAKE_BINARY_DIR}/googletest) + include_directories(SYSTEM ${GTEST_INCLUDE_DIR}) + + set(TEST_LIBRARIES gtest gtest_main) diff --git a/dev-libs/rapidjson/files/rapidjson-1.1.0-valgrind_optional.patch b/dev-libs/rapidjson/files/rapidjson-1.1.0-valgrind_optional.patch new file mode 100644 index 000000000000..071a3d2392df --- /dev/null +++ b/dev-libs/rapidjson/files/rapidjson-1.1.0-valgrind_optional.patch @@ -0,0 +1,21 @@ +https://github.com/Tencent/rapidjson/issues/1808 + +--- /test/unittest/CMakeLists.txt ++++ /test/unittest/CMakeLists.txt +@@ -77,12 +77,15 @@ + COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin) + +-if(NOT MSVC) ++find_program(VALGRIND_EXECUTABLE valgrind) ++if(VALGRIND_EXECUTABLE) + # Not running SIMD.* unit test cases for Valgrind + add_test(NAME valgrind_unittest + COMMAND valgrind --leak-check=full --error-exitcode=1 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest --gtest_filter=-SIMD.* + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin) ++endif(VALGRIND_EXECUTABLE) + ++if(NOT MSVC) + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + add_test(NAME symbol_check + COMMAND sh -c "objdump -t -C libnamespacetest.a | grep rapidjson ; test $? -ne 0" diff --git a/dev-libs/rapidjson/files/rapidjson-1.1.1-valgrind_optional.patch b/dev-libs/rapidjson/files/rapidjson-1.1.1-valgrind_optional.patch new file mode 100644 index 000000000000..b40a39fb13db --- /dev/null +++ b/dev-libs/rapidjson/files/rapidjson-1.1.1-valgrind_optional.patch @@ -0,0 +1,21 @@ +https://github.com/Tencent/rapidjson/issues/1808 + +--- /test/unittest/CMakeLists.txt ++++ /test/unittest/CMakeLists.txt +@@ -78,12 +78,15 @@ + COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin) + +-if(NOT MSVC) ++find_program(VALGRIND_EXECUTABLE valgrind) ++if(VALGRIND_EXECUTABLE) + # Not running SIMD.* unit test cases for Valgrind + add_test(NAME valgrind_unittest + COMMAND valgrind --suppressions=${CMAKE_SOURCE_DIR}/test/valgrind.supp --leak-check=full --error-exitcode=1 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest --gtest_filter=-SIMD.* + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin) ++endif(VALGRIND_EXECUTABLE) + ++if(NOT MSVC) + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + add_test(NAME symbol_check + COMMAND sh -c "objdump -t -C libnamespacetest.a | grep rapidjson ; test $? -ne 0" diff --git a/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild new file mode 100644 index 000000000000..546127329df2 --- /dev/null +++ b/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="A fast JSON parser/generator for C++ with both SAX/DOM style API" +HOMEPAGE="https://rapidjson.org/" + +LICENSE="MIT" +IUSE="doc examples test" +RESTRICT="!test? ( test )" +SLOT="0" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/miloyip/rapidjson.git" + inherit git-r3 +else + SRC_URI="https://github.com/miloyip/rapidjson/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" + S="${WORKDIR}/rapidjson-${PV}" +fi + +DEPEND=" + doc? ( app-doc/doxygen ) + test? ( dev-cpp/gtest )" +RDEPEND="" + +PATCHES=( + "${FILESDIR}/${P}-gcc-7.patch" + "${FILESDIR}/${P}-system_gtest.patch" + "${FILESDIR}/${P}-valgrind_optional.patch" +) + +src_prepare() { + cmake_src_prepare + + sed -i -e 's| -march=native||g' CMakeLists.txt || die + sed -i -e 's| -Werror||g' CMakeLists.txt example/CMakeLists.txt test/unittest/CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + -DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${PF}" + -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" + -DRAPIDJSON_BUILD_DOC=$(usex doc) + -DRAPIDJSON_BUILD_EXAMPLES=$(usex examples) + -DRAPIDJSON_BUILD_TESTS=$(usex test) + -DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF + -DVALGRIND_EXECUTABLE= + ) + cmake_src_configure +} diff --git a/dev-libs/rapidjson/rapidjson-9999.ebuild b/dev-libs/rapidjson/rapidjson-9999.ebuild index 7abb247fd71d..081c33172b8d 100644 --- a/dev-libs/rapidjson/rapidjson-9999.ebuild +++ b/dev-libs/rapidjson/rapidjson-9999.ebuild @@ -19,23 +19,26 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/miloyip/rapidjson/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" S="${WORKDIR}/rapidjson-${PV}" fi DEPEND=" doc? ( app-doc/doxygen ) - test? ( - dev-cpp/gtest - dev-util/valgrind - )" + test? ( dev-cpp/gtest )" RDEPEND="" +PATCHES=( + "${FILESDIR}/${PN}-1.1.0-system_gtest.patch" + "${FILESDIR}/${PN}-1.1.1-valgrind_optional.patch" +) + src_prepare() { cmake_src_prepare - sed -i -e 's|-Werror||g' CMakeLists.txt || die - sed -i -e 's|-Werror||g' example/CMakeLists.txt || die + sed -i -e 's| -march=native||g' CMakeLists.txt || die + sed -i -e 's| -mcpu=native||g' CMakeLists.txt || die + sed -i -e 's| -Werror||g' CMakeLists.txt || die } src_configure() { @@ -46,6 +49,7 @@ src_configure() { -DRAPIDJSON_BUILD_EXAMPLES=$(usex examples) -DRAPIDJSON_BUILD_TESTS=$(usex test) -DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF + -DVALGRIND_EXECUTABLE= ) cmake_src_configure } -- cgit v1.2.3