diff --git a/boost.spec b/boost.spec index d6d53ca1a0ad35836e2c06d300068f04be336615..8f8970a60234eb68297d0962ccb8bb993d6825a6 100644 --- a/boost.spec +++ b/boost.spec @@ -1,8 +1,8 @@ -%global version_enc 1_83_0 +%global version_enc 1_81_0 Name: boost -Version: 1.83.0 -Release: 2 +Version: 1.81.0 +Release: 4 Summary: The free peer-reviewed portable C++ source libraries License: BSL-1.0 URL: http://www.boost.org @@ -10,14 +10,16 @@ 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 -Patch1: boost-1.81-graph-Dont-run-performance-test-in-CI.patch +Patch2: boost-1.81-graph-Dont-run-performance-test-in-CI.patch # https://github.com/boostorg/random/pull/83 -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 +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 # https://github.com/boostorg/phoenix/pull/116 -Patch5: boost-1.81-phoenix-Update-avoid-placeholders-uarg1.10-ODR-violates.patch +Patch6: boost-1.81-phoenix-Update-avoid-placeholders-uarg1.10-ODR-violates.patch Requires: %{name}-atomic%{?_isa} = %{version}-%{release} Requires: %{name}-chrono%{?_isa} = %{version}-%{release} @@ -56,10 +58,8 @@ BuildRequires: python3-devel python3-unversioned-command BuildRequires: openssl-devel # optional libraries for iostreams BuildRequires: bzip2-devel libzstd-devel xz-devel zlib-devel -%ifnarch loongarch64 # optional library for multiprecision BuildRequires: libquadmath-devel libquadmath-static -%endif # optional library for python3 BuildRequires: python3-numpy # optional library for regex @@ -281,13 +281,19 @@ 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=%toolchain %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 %define b2_options %{opt_build} %{opt_feature} %{opt_libs} %define boost_macros define=BOOST_NO_AUTO_PTR define=BOOST_STATECHART_USE_NATIVE_RTTI -./b2 %{b2_options} cxxflags="$RPM_OPT_FLAGS" %{boost_macros} + +%if "%toolchain" == "clang" + %global make_opts HOSTCC=clang CC=clang CXX=clang++ + ./b2 %{b2_options} toolset=clang cxxflags="$RPM_OPT_FLAGS" %{boost_macros} +%else + ./b2 %{b2_options} cxxflags="$RPM_OPT_FLAGS" %{boost_macros} +%endif %check (cd status @@ -450,11 +456,9 @@ find libs -name example -exec cp {} boost-example --parents -r \; %{_libdir}/*.a %changelog -* Sat Mar 2 2024 Wenlong Zhang - 1.83.0-2 -- No libquadmath-devel libquadmath-static on loongarch64 - -* Thu Jan 25 2024 chenhaixiang - 1.83.0-1 -- Update to 1.83.0 +* Fri Apr 21 2023 jammyjellyfish - 1.81.0-2 +- Support specify CC +- Signed-off-by: shafeipaozi * Mon Nov 27 2023 jiahua.yu - 1.81.0-3 - Init support for ppc64le