diff --git a/boost-1.78-build-Don-t-skip-install-targets-if-there-s-build-no-in-ureqs.patch b/boost-1.78-build-Don-t-skip-install-targets-if-there-s-build-no-in-ureqs.patch deleted file mode 100644 index ca4e6ba95e141670f50cf34f223ac35ce18857ab..0000000000000000000000000000000000000000 --- a/boost-1.78-build-Don-t-skip-install-targets-if-there-s-build-no-in-ureqs.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 62e7321669f66a90e2a90c8f31af34f59ebc5d7a Mon Sep 17 00:00:00 2001 -From: Dmitry Arkhipov -Date: Thu, 9 Dec 2021 08:11:57 +0300 -Subject: [PATCH] Don't skip install targets if there's no in ureqs - ---- - tools/build/src/tools/stage.jam | 4 ++++ - tools/build/test/install_build_no.py | 26 ++++++++++++++++++++++++++ - tools/build/test/test_all.py | 1 + - 3 files changed, 31 insertions(+) - create mode 100755 test/install_build_no.py - -diff --git a/tools/build/src/tools/stage.jam b/tools/build/src/tools/stage.jam -index c5f02e3ba4..325129dc81 100644 ---- a/tools/build/src/tools/stage.jam -+++ b/tools/build/src/tools/stage.jam -@@ -478,6 +478,10 @@ class install-target-class : basic-target - return [ sequence.unique $(result2) ] ; - } - -+ rule skip-from-usage-requirements ( ) -+ { -+ } -+ - # Returns true iff 'type' is subtype of some element of 'types-to-include'. - # - local rule include-type ( type : types-to-include * ) -diff --git a/tools/build/test/install_build_no.py b/tools/build/test/install_build_no.py -new file mode 100755 -index 0000000000..0ccf3c5cc6 ---- /dev/null -+++ b/tools/build/test/install_build_no.py -@@ -0,0 +1,26 @@ -+#!/usr/bin/python -+ -+# Copyright 2021 Dmitry Arkhipov (grisumbras@gmail.com) -+# Distributed under the Boost Software License, Version 1.0. -+# (See accompanying file LICENSE.txt or https://www.bfgroup.xyz/b2/LICENSE.txt) -+ -+# Check that no in usage-requirements of dependencies does not affect -+# install rule, i.e. a skipped installed target does not affect insallation of -+# other targets. -+ -+import BoostBuild -+ -+t = BoostBuild.Tester() -+ -+t.write("a.cpp", "int main() {}\n") -+ -+t.write("jamroot.jam", """ -+make x : : maker : no ; -+exe a : a.cpp ; -+install install : x a ; -+""") -+ -+t.run_build_system() -+t.expect_addition("install/a.exe") -+ -+t.cleanup() -diff --git a/tools/build/test/test_all.py b/tools/build/test/test_all.py -index b7ef5ad701..9ed729d017 100644 ---- a/tools/build/test/test_all.py -+++ b/tools/build/test/test_all.py -@@ -250,6 +250,7 @@ def reorder_tests(tests, first_test): - "inherit_toolset", - "inherited_dependency", - "inline", -+ "install_build_no", - "libjpeg", - "liblzma", - "libpng", diff --git a/boost.spec b/boost.spec index abcf821dfff794e09212d08d90288d4d411ebbd3..c96ed5dfeb197227bfffffb1dd31c277d6fe60f3 100644 --- a/boost.spec +++ b/boost.spec @@ -1,4 +1,4 @@ -%define anolis_release 3 +%define anolis_release 1 %global boost_docdir __tmp_docdir %global boost_examplesdir __tmp_examplesdir @@ -30,7 +30,7 @@ Name: boost %global real_name boost Summary: The free peer-reviewed portable C++ source libraries -Version: 1.78.0 +Version: 1.81.0 Release: %{anolis_release}%{dist} License: Boost and MIT and Python BuildRequires: lua-posix @@ -44,7 +44,7 @@ BuildRequires: lua-posix %global toplev_dirname %{real_name}_%{version_enc} URL: http://www.boost.org -Source0: https://boostorg.jfrog.io/artifactory/main/release/%{version}/source/%{name}_%{version_enc}.tar.gz +Source0: https://boostorg.jfrog.io/artifactory/main/release/%{version}/source/%{name}_%{version_enc}.tar.bz2 Source1: libboost_thread.so # Add a manual page for b2, based on the online documentation: # http://www.boost.org/boost-build2/doc/html/bbv2/overview.html @@ -89,6 +89,7 @@ Requires: %{name}-test = %{version}-%{release} Requires: %{name}-thread = %{version}-%{release} Requires: %{name}-timer = %{version}-%{release} Requires: %{name}-type_erasure = %{version}-%{release} +Requires: %{name}-url = %{version}-%{release} Requires: %{name}-wave = %{version}-%{release} %if %{with python3} @@ -102,6 +103,7 @@ BuildRequires: libstdc++-devel BuildRequires: bzip2-devel BuildRequires: zlib-devel BuildRequires: xz-devel +BuildRequires: libzstd-devel %if %{with python3} BuildRequires: python3-devel BuildRequires: python3-numpy @@ -112,9 +114,6 @@ BuildRequires: libquadmath-devel %endif BuildRequires: bison -# https://github.com/bfgroup/b2/pull/113 -Patch4: boost-1.78-build-Don-t-skip-install-targets-if-there-s-build-no-in-ureqs.patch - %bcond_with tests %bcond_with docs_generated @@ -390,10 +389,21 @@ Requires: %{name}-chrono = %{version}-%{release} Requires: %{name}-system = %{version}-%{release} %description type_erasure - The Boost.TypeErasure library provides runtime polymorphism in C++ that is more flexible than that provided by the core language. +%package url +Summary: Run-time component of boost url library +Requires: %{name}-system = %{version}-%{release} + +%description url +Boost.URL is a portable C++ library which provides containers and algorithms +which model a "URL", more formally described using the Uniform Resource +Identifier (URI) specification (henceforth referred to as rfc3986). A URL +is a compact sequence of characters that identifies an abstract or physical +resource. + + %package wave Summary: Run-time component of boost C99/C++ preprocessing library Requires: %{name}-chrono = %{version}-%{release} @@ -605,7 +615,6 @@ Tools for working with Boost documentation in BoostBook or QuickBook format. Summary: A low-level build tool Obsoletes: boost-jam < 1.73.0 Provides: boost-jam = %{version} -Provides: boost-jam%{?_isa} = %{version} %description b2 B2 (formerly Boost.Jam) is the low-level build engine tool for Boost.Build. @@ -613,8 +622,8 @@ Historically, B2 was based on on FTJam and on Perforce Jam but has grown a number of significant features and is now developed independently. %prep - %autosetup -p1 -n %{name}_%{version_enc} + %build %set_build_flags # Dump the versions being used into the build logs. @@ -820,12 +829,9 @@ echo ============================= install Boost.Build ================== (cd tools/build ./b2 --prefix=$RPM_BUILD_ROOT%{_prefix} install # Fix some permissions - chmod +x $RPM_BUILD_ROOT%{_datadir}/boost-build/src/tools/doxproc.py + chmod +x $RPM_BUILD_ROOT%{_datadir}/b2/src/tools/doxproc.py # Fix shebang using unversioned python - sed -i '1s@^#!/usr/bin.python$@&3@' $RPM_BUILD_ROOT%{_datadir}/boost-build/src/tools/doxproc.py - # Empty file - rm $RPM_BUILD_ROOT%{_datadir}/boost-build/src/tools/doxygen/windows-paths-check.hpp - rm -f $RPM_BUILD_ROOT%{_datadir}/boost-build/src/tools/doxygen/windows-paths-check.hpp + sed -i '1s@^#!/usr/bin.python$@&3@' $RPM_BUILD_ROOT%{_datadir}/b2/src/tools/doxproc.py # Install the manual page %{__install} -p -m 644 %{SOURCE2} -D $RPM_BUILD_ROOT%{_mandir}/man1/b2.1 ) @@ -1096,6 +1102,11 @@ fi %{_libdir}/libboost_type_erasure.so.%{sonamever} %{abidir}/libboost_type_erasure.dump +%files url +%license LICENSE_1_0.txt +%{_libdir}/libboost_url.so.%{sonamever} +%{abidir}/libboost_url.dump + %files wave %license LICENSE_1_0.txt %{_libdir}/libboost_wave.so.%{sonamever} @@ -1160,6 +1171,7 @@ fi %{_libdir}/libboost_system.so %{_libdir}/libboost_thread.so %{_libdir}/libboost_timer.so +%{_libdir}/libboost_url.so %{_libdir}/libboost_type_erasure.so %{_libdir}/libboost_wave.so @@ -1241,7 +1253,7 @@ fi %files build %license LICENSE_1_0.txt -%{_datadir}/%{name}-build/ +%{_datadir}/b2 %files doctools %license LICENSE_1_0.txt @@ -1255,7 +1267,10 @@ fi %{abidir}/b2-option.list %{_mandir}/man1/b2.1* -%changelog +%changelog +* Fri Dec 30 2022 Funda Wang - 1.81.0-1 +- New version 1.81.0 + * Mon Dec 05 2022 Chunmei Xu - 1.78.0-3 - rebuild with icu update diff --git a/boost_1_78_0.tar.gz b/boost_1_81_0.tar.bz2 similarity index 82% rename from boost_1_78_0.tar.gz rename to boost_1_81_0.tar.bz2 index 190dc53c072f2cac18dee9d1fc1c171a7582668e..15dda77a73711c9142825d7e1438dacfec2207e3 100644 Binary files a/boost_1_78_0.tar.gz and b/boost_1_81_0.tar.bz2 differ