Backport outcome bugfix

This commit is contained in:
Liu Zixian 2022-11-26 10:45:48 +08:00
parent cb9eb41e80
commit 565bcbca70
2 changed files with 32 additions and 1 deletions

View File

@ -0,0 +1,26 @@
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

View File

@ -2,7 +2,7 @@
Name: boost
Version: 1.80.0
Release: 1
Release: 2
Summary: The free peer-reviewed portable C++ source libraries
License: BSL-1.0
URL: http://www.boost.org
@ -12,6 +12,8 @@ Source0: https://boostorg.jfrog.io/ui/native/main/release/%{version}/sour
# Remove them at the next release
# https://github.com/boostorg/python/pull/373
Patch0: boost-1.78-python-Update-call_method-hpp.patch
# https://github.com/ned14/outcome/commit/66ebdd4e86ab593c8723ee69f6654260de19775e
Patch1: boost-1.80-outcome-Stop-Boost-regression-tests-complaining-about-no-test-tree.patch
Requires: %{name}-atomic%{?_isa} = %{version}-%{release}
Requires: %{name}-chrono%{?_isa} = %{version}-%{release}
@ -427,6 +429,9 @@ find libs -name example -exec cp {} boost-example --parents -r \;
%{_libdir}/*.a
%changelog
* Sat Nov 26 2022 Liu Zixian <liuzixian4@huawei.com> - 1.80.0-2
- Backport outcome regression test bugfix
* Wed Aug 24 2022 Liu Zixian <liuzixian4@huawei.com> - 1.80.0-1
- update to 1.80.0