diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..4cfa2dd91d063f78a4bdb5777d226c9884f10fea --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..faa96ea39d86c2bbfa7ab79d397c85ad7b5a8489 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/boost diff --git a/boost-1.73.0-cmakedir.patch b/boost-1.73.0-cmakedir.patch new file mode 100644 index 0000000000000000000000000000000000000000..e47728f52128f7b78eb3fdf5fcda4920416d48f3 --- /dev/null +++ b/boost-1.73.0-cmakedir.patch @@ -0,0 +1,28 @@ +--- boost_1_73_0/tools/boost_install/boost-install.jam~ 2020-04-24 20:21:50.330267122 +0100 ++++ boost_1_73_0/tools/boost_install/boost-install.jam 2020-04-24 20:22:16.818360540 +0100 +@@ -652,25 +652,6 @@ + "get_filename_component(_BOOST_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" REALPATH)" + : true ; + +- if [ path.is-rooted $(cmakedir) ] +- { +- local cmakedir-native = [ path-native-fwd $(cmakedir) ] ; +- +- print.text +- +- "" +- "# If the computed and the original directories are symlink-equivalent, use original" +- "if(EXISTS \"$(cmakedir-native)\")" +- " get_filename_component(_BOOST_CMAKEDIR_ORIGINAL \"$(cmakedir-native)\" REALPATH)" +- " if(_BOOST_CMAKEDIR STREQUAL _BOOST_CMAKEDIR_ORIGINAL)" +- " set(_BOOST_CMAKEDIR \"$(cmakedir-native)\")" +- " endif()" +- " unset(_BOOST_CMAKEDIR_ORIGINAL)" +- "endif()" +- "" +- : true ; +- } +- + get-dir "_BOOST_INCLUDEDIR" : $(includedir) ; + + if $(library-type) = INTERFACE diff --git a/boost.spec b/boost.spec index ebb3b83b997f902432471c3f2ca0456ddac0740c..79284736754e45e19aa2d49cbf7c4befcb9ef480 100644 --- a/boost.spec +++ b/boost.spec @@ -1,12 +1,12 @@ -%global version_enc 1_83_0 +%define version_enc %(echo "%{version}"|tr \. _) Name: boost Version: 1.83.0 -Release: 4 +Release: 5 Summary: The free peer-reviewed portable C++ source libraries License: BSL-1.0 -URL: http://www.boost.org -Source0: https://boostorg.jfrog.io/ui/native/main/release/%{version}/source/%{name}_%{version_enc}.tar.gz +URL: https://www.boost.org +Source0: https://archives.boost.io/release/%{version}/source/boost_%{version_enc}.tar.bz2 # These following patches have been merged into boost develop branch # Remove them at the next release @@ -18,6 +18,8 @@ Patch3: boost-1.81-random-Update-multiprecision_int_test.cpp-to-not-accidental.p Patch4: 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 +# https://lists.boost.org/Archives/boost/2020/04/248812.php +Patch6: boost-1.73.0-cmakedir.patch Requires: %{name}-atomic%{?_isa} = %{version}-%{release} Requires: %{name}-chrono%{?_isa} = %{version}-%{release} @@ -64,6 +66,7 @@ BuildRequires: libquadmath-devel libquadmath-static BuildRequires: python3-numpy # optional library for regex BuildRequires: libicu-devel +BuildRequires: cmake-rpm-macros Obsoletes: boost-signals < 1.69.0 @@ -282,7 +285,7 @@ as that on the Boost web page (http://www.boost.org/doc/libs/%{version_enc}). %build ./bootstrap.sh --with-toolset=%{__cc} -%define opt_build -d+2 -q %{?_smp_mflags} --no-cmake-config +%define opt_build -d+2 -q %{?_smp_mflags} %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} @@ -300,6 +303,9 @@ as that on the Boost web page (http://www.boost.org/doc/libs/%{version_enc}). --libdir=$RPM_BUILD_ROOT%{_libdir} \ install +# Remove buildroot definition from cmake files +sed -i -e 's,%{buildroot},,g' $(find %{buildroot}%{_libdir}/cmake -name "*.cmake") + mkdir boost-doc boost-example cp -r index.html boost.png rst.css boost.css doc more boost-doc find libs -name doc -exec cp {} boost-doc --parents -r \; @@ -448,8 +454,12 @@ find libs -name example -exec cp {} boost-example --parents -r \; %{_includedir}/%{name} %{_libdir}/*.so %{_libdir}/*.a +%{_libdir}/cmake/* %changelog +* Sat Nov 30 2024 Funda Wang - 1.83.0-5 +- install cmake config files as suggested by cmake + * Sun Apr 28 2024 yinsist - 1.83.0-4 - Disable libquadmath dependency for RISC-V as gcc does not currently support RISC-V's libquadmath diff --git a/boost_1_83_0.tar.bz2 b/boost_1_83_0.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..269b90fefe83803e5a480d84ba6e78e17149e881 --- /dev/null +++ b/boost_1_83_0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e +size 122892751 diff --git a/boost_1_83_0.tar.gz b/boost_1_83_0.tar.gz deleted file mode 100644 index e169028e981901338a206efd62ada034789c3316..0000000000000000000000000000000000000000 Binary files a/boost_1_83_0.tar.gz and /dev/null differ