From 424cfd70fe52f1689a9f96905334ffe572f4bb27 Mon Sep 17 00:00:00 2001 From: Liu Zixian Date: Sun, 16 Oct 2022 17:16:21 +0800 Subject: [PATCH] try regression test --- Fix-uuid-test-path.patch | 45 ++++++++++++++++++++++++++++++++++++++++ boost.spec | 9 ++++++-- 2 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 Fix-uuid-test-path.patch diff --git a/Fix-uuid-test-path.patch b/Fix-uuid-test-path.patch new file mode 100644 index 0000000..7afe59a --- /dev/null +++ b/Fix-uuid-test-path.patch @@ -0,0 +1,45 @@ +From 68ed4d4724f1ff4c8e8817ff58798bd455c53fb6 Mon Sep 17 00:00:00 2001 +From: Liu Zixian +Date: Sun, 16 Oct 2022 16:07:01 +0800 +Subject: [PATCH] Fix uuid test path + +boost.uuid changed header path for standalone build[1], +but the relative path differs from boost release package, +so we should revert this change when building boost as a whole. + +Signed-off-by: Liu Zixian +--- + libs/uuid/test/Jamfile.v2 | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libs/uuid/test/Jamfile.v2 b/libs/uuid/test/Jamfile.v2 +index 8744bb9f3..03cfe8808 100644 +--- a/libs/uuid/test/Jamfile.v2 ++++ b/libs/uuid/test/Jamfile.v2 +@@ -39,7 +39,7 @@ rule test_all + { + local all_rules = ; + local file ; +- local headers_path = [ path.make ../include/boost/uuid ] ; ++ local headers_path = [ path.make ../../../boost/uuid ] ; + for file in [ path.glob-tree $(headers_path) : *.hpp : uuid ] + { + local rel_file = [ path.relative-to $(headers_path) $(file) ] ; +@@ -65,12 +65,12 @@ rule test_all + all_rules += [ compile compile/decl_header.cpp : + "BOOST_UUID_TEST_HEADER=uuid.hpp" + "BOOST_UUID_NO_TYPE_TRAITS" +- ../include/boost/uuid/uuid.hpp : ++ ../../../boost/uuid/uuid.hpp : + compile_uuid_no_type_traits ] ; + all_rules += [ compile compile/decl_header.cpp : + "BOOST_UUID_TEST_HEADER=uuid.hpp" + "BOOST_UUID_NO_SIMD" +- ../include/boost/uuid/uuid.hpp : ++ ../../../boost/uuid/uuid.hpp : + compile_uuid_no_simd ] ; + + # ECHO All rules: $(all_rules) ; +-- +2.36.1 + diff --git a/boost.spec b/boost.spec index bf6fa02..5f501b9 100644 --- a/boost.spec +++ b/boost.spec @@ -11,7 +11,9 @@ 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/boostorg/python/pull/373 -Patch0: boost-1.78-python-Update-call_method-hpp.patch +Patch0: boost-1.78-python-Update-call_method-hpp.patch + +Patch9000: Fix-uuid-test-path.patch Requires: %{name}-atomic%{?_isa} = %{version}-%{release} Requires: %{name}-chrono%{?_isa} = %{version}-%{release} @@ -275,8 +277,11 @@ as that on the Boost web page (http://www.boost.org/doc/libs/%{version_enc}). ./b2 %{b2_options} cxxflags="$RPM_OPT_FLAGS" define=%{boost_macros} %check +%define check_build %{?_smp_mflags} +%define check_libs --exclude-tests=graph_parallel,mpi +%define check_options %{check_build} %{opt_feature} %{check_libs} (cd status - ../b2 %{?_smp_mflags} --check-libs-only + ../b2 %{check_options} --include-tests=graph ) %install -- Gitee