From 0ee4abfd5cd75d1e0ab2bcd9b4b87b8f583f7599 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Mon, 28 Dec 2020 00:00:00 +0000 Subject: [PATCH 1/4] dev-libs/rapidjson: Do not force -march=native / -mcpu=native flags for examples. Bug: https://bugs.gentoo.org/760881 Signed-off-by: Arfrever Frehtes Taifersar Arahesis --- dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild | 4 ++-- dev-libs/rapidjson/rapidjson-9999.ebuild | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild index f4bf74949e0..71f4b9e6d5f 100644 --- a/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild +++ b/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild @@ -37,8 +37,8 @@ PATCHES=( 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| -Werror||g' CMakeLists.txt example/CMakeLists.txt test/unittest/CMakeLists.txt || die } src_configure() { diff --git a/dev-libs/rapidjson/rapidjson-9999.ebuild b/dev-libs/rapidjson/rapidjson-9999.ebuild index 7abb247fd71..a0264b2b983 100644 --- a/dev-libs/rapidjson/rapidjson-9999.ebuild +++ b/dev-libs/rapidjson/rapidjson-9999.ebuild @@ -34,8 +34,9 @@ RDEPEND="" 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() { -- 2.29.2 From 28984f9b187bdffd45d1f73090f455a126a9cc0a Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Mon, 28 Dec 2020 00:00:00 +0000 Subject: [PATCH 2/4] dev-libs/rapidjson: Make dev-util/valgrind optional. Bug: https://bugs.gentoo.org/760881 Signed-off-by: Arfrever Frehtes Taifersar Arahesis --- .../rapidjson-1.1.0-valgrind_optional.patch | 21 +++++++++++++++++++ .../rapidjson-1.1.1-valgrind_optional.patch | 21 +++++++++++++++++++ dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild | 6 ++---- dev-libs/rapidjson/rapidjson-9999.ebuild | 9 ++++---- 4 files changed, 49 insertions(+), 8 deletions(-) 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 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 00000000000..071a3d2392d --- /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 00000000000..b40a39fb13d --- /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-r2.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild index 71f4b9e6d5f..8fe98918476 100644 --- a/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild +++ b/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild @@ -24,14 +24,12 @@ fi DEPEND=" doc? ( app-doc/doxygen ) - test? ( - dev-cpp/gtest - dev-util/valgrind - )" + test? ( dev-cpp/gtest )" RDEPEND="" PATCHES=( "${FILESDIR}/${P}-gcc-7.patch" + "${FILESDIR}/${P}-valgrind_optional.patch" ) src_prepare() { diff --git a/dev-libs/rapidjson/rapidjson-9999.ebuild b/dev-libs/rapidjson/rapidjson-9999.ebuild index a0264b2b983..524f71c00d4 100644 --- a/dev-libs/rapidjson/rapidjson-9999.ebuild +++ b/dev-libs/rapidjson/rapidjson-9999.ebuild @@ -25,12 +25,13 @@ fi DEPEND=" doc? ( app-doc/doxygen ) - test? ( - dev-cpp/gtest - dev-util/valgrind - )" + test? ( dev-cpp/gtest )" RDEPEND="" +PATCHES=( + "${FILESDIR}/${PN}-1.1.1-valgrind_optional.patch" +) + src_prepare() { cmake_src_prepare -- 2.29.2 From 5ce297c3302379ef6fbd207c37ddcd7ac0303281 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Mon, 28 Dec 2020 00:00:00 +0000 Subject: [PATCH 3/4] dev-libs/rapidjson: Fix detection of dev-cpp/gtest. Bug: https://bugs.gentoo.org/760881 Signed-off-by: Arfrever Frehtes Taifersar Arahesis --- .../files/rapidjson-1.1.0-system_gtest.patch | 44 +++++++++++++++++++ dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild | 1 + dev-libs/rapidjson/rapidjson-9999.ebuild | 1 + 3 files changed, 46 insertions(+) create mode 100644 dev-libs/rapidjson/files/rapidjson-1.1.0-system_gtest.patch 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 00000000000..bdc720e8cf8 --- /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/rapidjson-1.1.0-r2.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild index 8fe98918476..28792918d05 100644 --- a/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild +++ b/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild @@ -29,6 +29,7 @@ RDEPEND="" PATCHES=( "${FILESDIR}/${P}-gcc-7.patch" + "${FILESDIR}/${P}-system_gtest.patch" "${FILESDIR}/${P}-valgrind_optional.patch" ) diff --git a/dev-libs/rapidjson/rapidjson-9999.ebuild b/dev-libs/rapidjson/rapidjson-9999.ebuild index 524f71c00d4..35932e6dee9 100644 --- a/dev-libs/rapidjson/rapidjson-9999.ebuild +++ b/dev-libs/rapidjson/rapidjson-9999.ebuild @@ -29,6 +29,7 @@ DEPEND=" RDEPEND="" PATCHES=( + "${FILESDIR}/${PN}-1.1.0-system_gtest.patch" "${FILESDIR}/${PN}-1.1.1-valgrind_optional.patch" ) -- 2.29.2 From e9875029843cc7bf906bc6bc7060f6bfa726c111 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Mon, 28 Dec 2020 00:00:00 +0000 Subject: [PATCH 4/4] dev-libs/rapidjson: Disable valgrind_unittest. valgrind_unittest currently fails in both rapidjson-1.1.0-r2 and rapidjson-9999. Bug: https://bugs.gentoo.org/760881 Signed-off-by: Arfrever Frehtes Taifersar Arahesis --- dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild | 1 + dev-libs/rapidjson/rapidjson-9999.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild index 28792918d05..e33226265d4 100644 --- a/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild +++ b/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild @@ -48,6 +48,7 @@ src_configure() { -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 35932e6dee9..761581bf03c 100644 --- a/dev-libs/rapidjson/rapidjson-9999.ebuild +++ b/dev-libs/rapidjson/rapidjson-9999.ebuild @@ -49,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 } -- 2.29.2