Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
3df141956b
!8 [sync] PR-7: 添加sw架构
From: @openeuler-sync-bot 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
2022-12-19 07:47:06 +00:00
Wu Zixuan
fb53ed36e2 Add sw64 architecture
Signed-off-by: Wu Zixuan <wuzx1226@qq.com>
(cherry picked from commit 3515145f664b0b833639ecca266f6b17dcd5aba3)
2022-12-06 20:00:40 +08:00
openeuler-ci-bot
b57f223611 !5 fix tag_prefix error
From: @hht8
Reviewed-by: @licihua
Signed-off-by: @licihua
2021-01-05 16:38:27 +08:00
hht8
a7b4acff75 fix tag_prefix error 2021-01-05 16:28:31 +08:00
openeuler-ci-bot
bc8f46c727 !4 【轻量级 PR】:修改拼写错误
Merge pull request !4 from Monday/N/A
2020-08-10 09:46:57 +08:00
Monday
7afb980d8b 修改拼写错误 2020-08-09 12:24:35 +08:00
openeuler-ci-bot
2eff54f282 !3 fix build fail due to hardlink path
Merge pull request !3 from ultra_planet/master
2020-07-30 10:55:34 +08:00
lingsheng
092a475f8b Not use hardlink absolute path 2020-07-29 16:10:21 +08:00
openeuler-ci-bot
f40bec6e6f !2 package init
Merge pull request !2 from jeff200902/master
2020-06-28 19:00:52 +08:00
jeff200902
ddba8715dc rapidjson package init 2020-06-28 15:57:30 +08:00
4 changed files with 31 additions and 234 deletions

12
rapidjson-1.1.0-sw.patch Executable file
View File

@ -0,0 +1,12 @@
diff -Nuar rapidjson-1.1.0.org/include/rapidjson/rapidjson.h rapidjson-1.1.0.sw/include/rapidjson/rapidjson.h
--- rapidjson-1.1.0.org/include/rapidjson/rapidjson.h 2022-05-09 16:56:54.370734000 +0800
+++ rapidjson-1.1.0.sw/include/rapidjson/rapidjson.h 2022-05-09 16:58:52.180734000 +0800
@@ -234,7 +234,7 @@
// Detect with architecture macros
# elif defined(__sparc) || defined(__sparc__) || defined(_POWER) || defined(__powerpc__) || defined(__ppc__) || defined(__hpux) || defined(__hppa) || defined(_MIPSEB) || defined(_POWER) || defined(__s390__)
# define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN
-# elif defined(__i386__) || defined(__alpha__) || defined(__ia64) || defined(__ia64__) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_ALPHA) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || defined(__bfin__)
+# elif defined(__i386__) || defined(__alpha__) || defined(__sw_64__) || defined(__ia64) || defined(__ia64__) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_ALPHA) || defined(_M_SW_64) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || defined(__bfin__)
# define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN
# elif defined(_MSC_VER) && defined(_M_ARM)
# define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN

View File

@ -1,12 +1,13 @@
%global debug_package %{nil}
Name: rapidjson
Version: 1.1.0
Release: 9
Release: 11
Summary: small & selft-contained fast JSON parser and generator for C++
License: MIT
URL: http://miloyip.github.io/rapidjson
Source0: https://github.com/miloyip/rapidjson/archive/v%{version}.tar.gz#/rapidjson-%{version}.tar.gz
Patch0000: rapidjson-1.1.0-do_not_include_gtest_src_dir.patch
Patch0001: rapidjson-1.1.0-sw.patch
BuildRequires: cmake gcc-c++ gtest-devel valgrind
%description
@ -33,14 +34,18 @@ memory friendly, each JSON valude occupies exactly 16/20 bytes for most
%package help
Summary: Documentation-files for rapidjson
BuildArch: noarch
BuildRequires: %{_sbindir}/hardlink doxygen
BuildRequires: hardlink doxygen
Provides: rapidjson-doc = %{version}-%{release}
Obsoletes: rapidjson-doc < %{version}-%{release}
%description help
This package provides docs for rapidjson.
%prep
%autosetup -n rapidjson-%{version} -p1
%setup -n rapidjson-%{version}
%patch0 -p1
%ifarch sw_64
%patch1 -p1
%endif
install -d build
for _file in "license.txt" $(%{_bindir}/find example -type f -name '*.c*')
do
@ -66,8 +71,8 @@ cd -
%{__cp} -a CHANGELOG.md readme*.md examples %{buildroot}%{_pkgdocdir}
%{_bindir}/find %{buildroot} -type f -name 'CMake*.txt' -print0 | \
%{_bindir}/xargs -0 %{__rm} -fv
%{_sbindir}/hardlink -v %{buildroot}%{_includedir}
%{_sbindir}/hardlink -v %{buildroot}%{_pkgdocdir}
hardlink -v %{buildroot}%{_includedir}
hardlink -v %{buildroot}%{_pkgdocdir}
%check
CTEST_EXCLUDE=".*valgrind.*"
@ -88,5 +93,11 @@ cd -
%doc %{_pkgdocdir}
%changelog
* Wed Oct 26 2022 wuzx<wuzx1226@qq.com> - 1.1.0-11
- Add sw64 architecture
* Wed Jul 29 2020 lingsheng <lingsheng@huawei.com> - 1.1.0-10
- Not use hardlink absolute path
* Mon Jun 8 2020 Jeffery.Gao <gaojianxing@huawei.com> - 1.1.0-9
- Package init

View File

@ -1,226 +0,0 @@
# Conditional for release and snapshot builds. Uncomment for release-builds.
%global rel_build 1
# Settings used for build from snapshots.
%if 0%{?rel_build}
%global gittar %{name}-%{version}.tar.gz
%else # 0%%{?rel_build}
%global commit 67143c2ba002604a510ba436a8ed0d785a9f7de6
%global commit_date 20140801
%global shortcommit %(c=%{commit};echo ${c:0:7})
%global gitver git%{commit_date}-%{shortcommit}
%global gitrel .git%{commit_date}.%{shortcommit}
%global gittar %{name}-%{version}-%{gitver}.tar.gz
%endif # 0%%{?rel_build}
# This is a header-only lib. There is no debuginfo generated.
%global debug_package %{nil}
# Set %%_pkgdocdir-helper-macro if not defined.
%if 0%{!?_pkgdocdir:1}
%global _pkgdocdir %{_docdir}/%{name}-%{version}
%endif # 0%%{!?_pkgdocdir:1}
# CMake-builds go out-of-tree. Tests are not run in %%{buildroot}.
%global cmake_build_dir build-%{?__isa}%{?dist}
# Set %%giturl for later use.
%global giturl https://github.com/miloyip/%{name}/archive
%global common_desc \
RapidJSON is a fast JSON parser and generator for C++. It was \
inspired by RapidXml. \
\
RapidJSON is small but complete. It supports both SAX and DOM style \
API. The SAX parser is only a half thousand lines of code. \
\
RapidJSON is fast. Its performance can be comparable to strlen(). \
It also optionally supports SSE2/SSE4.1 for acceleration. \
\
RapidJSON is self-contained. It does not depend on external \
libraries such as BOOST. It even does not depend on STL. \
\
RapidJSON is memory friendly. Each JSON value occupies exactly \
16/20 bytes for most 32/64-bit machines (excluding text string). By \
default it uses a fast memory allocator, and the parser allocates \
memory compactly during parsing. \
\
RapidJSON is Unicode friendly. It supports UTF-8, UTF-16, UTF-32 \
(LE & BE), and their detection, validation and transcoding \
internally. For example, you can read a UTF-8 file and let RapidJSON \
transcode the JSON strings into UTF-16 in the DOM. It also supports \
surrogates and "\u0000" (null character). \
\
JSON(JavaScript Object Notation) is a light-weight data exchange \
format. RapidJSON should be in fully compliance with RFC4627/ECMA-404.
Name: rapidjson
Version: 1.1.0
Release: 8%{?gitrel}%{?dist}
Summary: Fast JSON parser and generator for C++
License: MIT
URL: http://miloyip.github.io/%{name}
%if 0%{?rel_build}
# Sources for release-builds.
Source0: %{giturl}/v%{version}.tar.gz#/}%{name}-%{version}.tar.gz}
%else # 0%%{?rel_build}
# Sources for snapshot-builds.
Source0: %{giturl}/%{commit}.tar.gz#/}%{name}-%{version}.tar.gz}
%endif # 0%%{?rel_build}
# Downstream-patch for gtest.
Patch0: rapidjson-1.1.0-do_not_include_gtest_src_dir.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: gtest-devel
BuildRequires: valgrind
%description
%{common_desc}
%package devel
Summary: %{summary}
BuildArch: noarch
Provides: %{name} == %{version}-%{release}
Provides: %{name}-static == %{version}-%{release}
%description devel
%{common_desc}
%files devel
%license license.txt
%doc %dir %{_pkgdocdir}
%doc %{_pkgdocdir}/CHANGELOG.md
%doc %{_pkgdocdir}/readme*.md
%{_datadir}/cmake
%{_datadir}/pkgconfig/*
%{_includedir}/%{name}
%package doc
Summary: Documentation-files for %{name}
%if 0%{?fedora} || 0%{?rhel} >= 8
BuildArch: noarch
%endif # 0%%{?fedora} || 0%%{?rhel} >= 8
BuildRequires: %{_sbindir}/hardlink
BuildRequires: doxygen
%description doc
This package contains the documentation-files for %{name}.
%files doc
# Pickup license-files from main-pkg's license-dir.
# If there's no license-dir they are picked up by %%doc previously.
%{?_licensedir:%license %{_datadir}/licenses/%{name}*}
%doc %{_pkgdocdir}
%prep
%setup -q%{!?rel_build:n %{name}-%{commit}}
%patch0 -p1 -b .gtest
%{__mkdir} -p %{cmake_build_dir}
# Fix 'W: wrong-file-end-of-line-encoding'.
for _file in "license.txt" $(%{_bindir}/find example -type f -name '*.c*')
do
%{__sed} -e 's!\r$!!g' < ${_file} > ${_file}.new && \
/bin/touch -r ${_file} ${_file}.new && \
%{__mv} -f ${_file}.new ${_file}
done
# Create an uncluttered backup of examples for inclusion in %%doc.
%{__cp} -a example examples
# Disable -Werror.
%{_bindir}/find . -type f -name 'CMakeLists.txt' -print0 | \
%{_bindir}/xargs -0 %{__sed} -i -e's![ \t]*-march=native!!g' -e's![ \t]*-Werror!!g'
%build
pushd %{cmake_build_dir}
%cmake \
-DDOC_INSTALL_DIR=%{_pkgdocdir} \
-DGTESTSRC_FOUND=TRUE \
-DGTEST_SOURCE_DIR=. \
..
%{__make} %{?_smp_mflags}
popd
%install
pushd %{cmake_build_dir}
%{__make} install DESTDIR=%{buildroot}
popd
# Move pkgconfig und CMake-stuff to generic datadir.
%{__mv} -f %{buildroot}%{_libdir}/* %{buildroot}%{_datadir}
# Copy the documentation-files to final location.
%{__cp} -a CHANGELOG.md readme*.md examples %{buildroot}%{_pkgdocdir}
# Find and purge build-sys files.
%{_bindir}/find %{buildroot} -type f -name 'CMake*.txt' -print0 | \
%{_bindir}/xargs -0 %{__rm} -fv
# Hardlink duplicated files to save space.
%{_sbindir}/hardlink -v %{buildroot}%{_includedir}
%{_sbindir}/hardlink -v %{buildroot}%{_pkgdocdir}
%check
# Valgrind fails on %%ix86 and ppc64le.
#%ifarch %{ix86} ppc64le
CTEST_EXCLUDE=".*valgrind.*"
#%endif # arch %%{ix86}
pushd %{cmake_build_dir}
%{_bindir}/ctest -E "${CTEST_EXCLUDE}" -V .
popd
%changelog
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Mar 7 2018 Tom Hughes <tom@compton.nu> - 1.1.0-7
- Require gcc-c++
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Wed Aug 9 2017 Tom Hughes <tom@compton.nu> - 1.1.0-5
- Update valgrind exclusions
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Fri May 05 2017 Björn Esser <besser82@fedoraproject.org> - 1.1.0-2
- Doc-pkg must be build archful on RHEL <= 7
* Fri Feb 10 2017 Tom Hughes <tom@compton.nu> - 1.1.0-1
- Update to 1.1.0 upstream release
- Drop -march=native as ppc64 doesn't recognise it
- Exclude valgrind on aarch64 due to unhandled instruction in libgcc
* Sun Apr 03 2016 Björn Esser <fedora@besser82.io> - 1.0.2-1
- update to latest upstream-release (#1322941)
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.12-0.4.git20140801.67143c2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.12-0.3.git20140801.67143c2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.12-0.2.git20140801.67143c2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Wed Aug 06 2014 Björn Esser <bjoern.esser@gmail.com> - 0.12-0.1.git20140801.67143c2
- initial rpm release (#1127380)

View File

@ -1,4 +1,4 @@
version-control: github
version_control: github
src_repo: Tencent/rapidjson
tag_prefix: v^
seperator: .
tag_prefix: "^v"
separator: .