Compare commits
10 Commits
f52746cf82
...
f86fc97413
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f86fc97413 | ||
|
|
3aa8906404 | ||
|
|
84f4f87d8b | ||
|
|
0fff1c3dd5 | ||
|
|
d7149f6ec5 | ||
|
|
42042bdc7c | ||
|
|
e7e69aa5f9 | ||
|
|
75903eabca | ||
|
|
9669d89ea9 | ||
|
|
709fb6eab8 |
@ -1,26 +0,0 @@
|
||||
From 66ebdd4e86ab593c8723ee69f6654260de19775e Mon Sep 17 00:00:00 2001
|
||||
From: "Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com)"
|
||||
<spamtrap@nedprod.com>
|
||||
Date: Fri, 18 Nov 2022 18:15:09 +0000
|
||||
Subject: [PATCH] Stop Boost regression tests complaining about no test tree.
|
||||
|
||||
---
|
||||
libs/outcome/test/tests/issue0255.cpp | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/libs/outcome/test/tests/issue0255.cpp b/libs/outcome/test/tests/issue0255.cpp
|
||||
index a8c962718f..bed5cceea5 100644
|
||||
--- a/libs/outcome/test/tests/issue0255.cpp
|
||||
+++ b/libs/outcome/test/tests/issue0255.cpp
|
||||
@@ -41,4 +41,11 @@ BOOST_OUTCOME_AUTO_TEST_CASE(issues / 0255 / test, "status_result<int> not usabl
|
||||
BOOST_CHECK(issues255::test().value() == 42);
|
||||
}
|
||||
|
||||
+#else
|
||||
+
|
||||
+BOOST_OUTCOME_AUTO_TEST_CASE(issues_0255_test, "status_result<int> not usable from constexpr in C++ 20")
|
||||
+{
|
||||
+ BOOST_CHECK(true);
|
||||
+}
|
||||
+
|
||||
#endif
|
||||
37
boost.spec
37
boost.spec
@ -1,8 +1,8 @@
|
||||
%global version_enc 1_81_0
|
||||
%global version_enc 1_83_0
|
||||
|
||||
Name: boost
|
||||
Version: 1.81.0
|
||||
Release: 3
|
||||
Version: 1.83.0
|
||||
Release: 5
|
||||
Summary: The free peer-reviewed portable C++ source libraries
|
||||
License: BSL-1.0
|
||||
URL: http://www.boost.org
|
||||
@ -10,16 +10,14 @@ Source0: https://boostorg.jfrog.io/ui/native/main/release/%{version}/sour
|
||||
|
||||
# These following patches have been merged into boost develop branch
|
||||
# Remove them at the next release
|
||||
# https://github.com/ned14/outcome/commit/66ebdd4e86ab593c8723ee69f6654260de19775e
|
||||
Patch1: boost-1.80-outcome-Stop-Boost-regression-tests-complaining-about-no-test-tree.patch
|
||||
# https://github.com/boostorg/graph/pull/318
|
||||
Patch2: boost-1.81-graph-Dont-run-performance-test-in-CI.patch
|
||||
Patch1: boost-1.81-graph-Dont-run-performance-test-in-CI.patch
|
||||
# https://github.com/boostorg/random/pull/83
|
||||
Patch3: boost-1.81-random-Update-multiprecision_float_test.cpp-to-not-overflow.patch
|
||||
Patch4: boost-1.81-random-Update-multiprecision_int_test.cpp-to-not-accidental.patch
|
||||
Patch5: boost-1.81-random-test-Add-missing-includes.patch
|
||||
Patch2: boost-1.81-random-Update-multiprecision_float_test.cpp-to-not-overflow.patch
|
||||
Patch3: boost-1.81-random-Update-multiprecision_int_test.cpp-to-not-accidental.patch
|
||||
Patch4: boost-1.81-random-test-Add-missing-includes.patch
|
||||
# https://github.com/boostorg/phoenix/pull/116
|
||||
Patch6: boost-1.81-phoenix-Update-avoid-placeholders-uarg1.10-ODR-violates.patch
|
||||
Patch5: boost-1.81-phoenix-Update-avoid-placeholders-uarg1.10-ODR-violates.patch
|
||||
|
||||
Requires: %{name}-atomic%{?_isa} = %{version}-%{release}
|
||||
Requires: %{name}-chrono%{?_isa} = %{version}-%{release}
|
||||
@ -58,8 +56,10 @@ BuildRequires: python3-devel python3-unversioned-command
|
||||
BuildRequires: openssl-devel
|
||||
# optional libraries for iostreams
|
||||
BuildRequires: bzip2-devel libzstd-devel xz-devel zlib-devel
|
||||
%ifnarch loongarch64 riscv64 sw_64 mips64el
|
||||
# optional library for multiprecision
|
||||
BuildRequires: libquadmath-devel libquadmath-static
|
||||
%endif
|
||||
# optional library for python3
|
||||
BuildRequires: python3-numpy
|
||||
# optional library for regex
|
||||
@ -281,7 +281,7 @@ as that on the Boost web page (http://www.boost.org/doc/libs/%{version_enc}).
|
||||
%autosetup -p1 -n %{name}_%{version_enc}
|
||||
|
||||
%build
|
||||
./bootstrap.sh
|
||||
./bootstrap.sh --with-toolset=%{__cc}
|
||||
%define opt_build -d+2 -q %{?_smp_mflags} --no-cmake-config
|
||||
%define opt_feature release debug-symbols=on pch=off
|
||||
%define opt_libs --without-mpi --without-graph_parallel
|
||||
@ -450,6 +450,21 @@ find libs -name example -exec cp {} boost-example --parents -r \;
|
||||
%{_libdir}/*.a
|
||||
|
||||
%changelog
|
||||
* Thu Mar 06 2025 mahailiang <mahailiang@uniontech.com> - 1.83.0-5
|
||||
- Disable libquadmath dependency for sw_64 mips64el
|
||||
|
||||
* Sun Apr 28 2024 yinsist <jianhui.oerv@isrc.iscas.ac.cn> - 1.83.0-4
|
||||
- Disable libquadmath dependency for RISC-V as gcc does not currently support RISC-V's libquadmath
|
||||
|
||||
* Thu Mar 14 2024 jammyjellyfish <jammyjellyfish255@outlook.com> - 1.83.0-3
|
||||
- Support specify CC
|
||||
|
||||
* Sat Mar 2 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 1.83.0-2
|
||||
- No libquadmath-devel libquadmath-static on loongarch64
|
||||
|
||||
* Thu Jan 25 2024 chenhaixiang <chenhaixiang3@huawei.com> - 1.83.0-1
|
||||
- Update to 1.83.0
|
||||
|
||||
* Mon Nov 27 2023 jiahua.yu <jiahua.yu@shingroup.cn> - 1.81.0-3
|
||||
- Init support for ppc64le
|
||||
|
||||
|
||||
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user