Compare commits

...

4 Commits

Author SHA1 Message Date
Troy Dawson c18f95002f remove package.cfg per new epel-playground policy 2020-09-24 17:33:36 +00:00
sagitter 8e1e4c9008 Exclude Valgrind Unittest on EPEL8-ppc64le (rhbz#1855859) 2020-07-15 13:01:10 +02:00
sagitter 96c50f053b Merge branch 'master' into epel8 2020-07-15 12:18:00 +02:00
Gwyn Ciesla 85607777c4 "Adding package.cfg file" 2020-07-14 15:30:47 -05:00
2 changed files with 33 additions and 2 deletions

View File

@ -0,0 +1,17 @@
--- a/test/unittest/CMakeLists.orig.txt 2016-08-25 09:59:05.000000000 +0200
+++ b/test/unittest/CMakeLists.txt 2020-07-12 13:58:09.673454279 +0200
@@ -77,7 +77,7 @@
COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
-if(NOT MSVC)
+if(NOT UNIX)
# 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.*
@@ -89,4 +89,4 @@
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
-endif(NOT MSVC)
+endif(NOT UNIX)

View File

@ -2,7 +2,7 @@
Name: rapidjson
Version: 1.1.0
Release: 13%{?dist}
Release: 14%{?dist}
Summary: Fast JSON parser and generator for C++
License: MIT
@ -11,6 +11,9 @@ Source0: https://github.com/Tencent/rapidjson/archive/v%{version}/%{name}-%{vers
# Downstream-patch for gtest
Patch0: rapidjson-1.1.0-do_not_include_gtest_src_dir.patch
# valgrind-unittest fails on EPEL8 PowerPC64-LittleEndian only
Patch1: rapidjson-disable_valgrind_test.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: gtest-devel
@ -63,7 +66,15 @@ This package contains the documentation-files for %{name}.
%prep
%autosetup -p 1 -n %{name}-%{version}
%autosetup -N -n %{name}-%{version}
%patch0 -p1
%if 0%{?el8}
%ifarch %{power64}
%patch1 -p1
%endif
%endif
# Remove bundled code
rm -rf thirdparty
@ -113,6 +124,9 @@ ctest -V %{?_smp_mflags}
%changelog
* Wed Jul 15 2020 Antonio Trande <sagitter@fedoraproject.org> - 1.1.0-14
- Exclude Valgrind Unittest on EPEL8-ppc64le (rhbz#1855859)
* Tue Jul 14 2020 Tom Hughes <tom@compton.nu> - 1.1.0-13
- Install pkg-config and cmake files to arched location
- Build documentation as noarch