From adf7ac15ffdfb0dda21b01b90ddafaaccbff9ad3 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 21 Sep 2024 13:51:59 +0200 Subject: [PATCH] remove conflicting mpi.so in python package [release 1.85.0-6mamba;Wed Sep 18 2024] --- README.md | 7 + libboost185-1.85.0-python-numpy-2.1.1.patch | 26 ++ libboost185.spec | 375 ++++++++++++++++++++ 3 files changed, 408 insertions(+) create mode 100644 libboost185-1.85.0-python-numpy-2.1.1.patch create mode 100644 libboost185.spec diff --git a/README.md b/README.md index 4195653..1541b1b 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,9 @@ # libboost185 +The Boost libraries provide free peer-reviewed portable C++ source libraries. +The emphasis is on libraries which work well with the C++ Standard Library. +The libraries are intended to be widely useful, and are in regular use by thousands of programmers across a broad spectrum of applications. + +A further goal is to establish "existing practice" and provide reference implementations so that Boost libraries are suitable for eventual standardization. +Ten Boost libraries will be included in the C++ Standards Committee's upcoming C++ Standard Library Technical Report as a step toward becoming part of a future C++ Standard. + diff --git a/libboost185-1.85.0-python-numpy-2.1.1.patch b/libboost185-1.85.0-python-numpy-2.1.1.patch new file mode 100644 index 0000000..e7a7d98 --- /dev/null +++ b/libboost185-1.85.0-python-numpy-2.1.1.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/932459 +https://github.com/boostorg/python/issues/431 +https://github.com/boostorg/python/pull/432 + +From 33ac06ca59a68266d3d26edf08205d31ddab4a6c Mon Sep 17 00:00:00 2001 +From: Alexis DUBURCQ +Date: Fri, 15 Mar 2024 14:10:16 +0100 +Subject: [PATCH] Support numpy 2.0.0b1 + +--- a/libs/python/src/numpy/dtype.cpp ++++ b/libs/python/src/numpy/dtype.cpp +@@ -98,7 +98,13 @@ python::detail::new_reference dtype::convert(object const & arg, bool align) + return python::detail::new_reference(reinterpret_cast(obj)); + } + +-int dtype::get_itemsize() const { return reinterpret_cast(ptr())->elsize;} ++int dtype::get_itemsize() const { ++#if NPY_ABI_VERSION < 0x02000000 ++ return reinterpret_cast(ptr())->elsize; ++#else ++ return PyDataType_ELSIZE(reinterpret_cast(ptr())); ++#endif ++} + + bool equivalent(dtype const & a, dtype const & b) { + // On Windows x64, the behaviour described on diff --git a/libboost185.spec b/libboost185.spec new file mode 100644 index 0000000..70379b7 --- /dev/null +++ b/libboost185.spec @@ -0,0 +1,375 @@ +%define pckver %(echo %version | tr . _) +%define pckmajver %(echo %version | cut -d. -f1-2 | tr . _) +Name: libboost185 +Version: 1.85.0 +Release: 6mamba +Summary: Free peer-reviewed portable C++ source libraries +Group: System/Libraries +Vendor: openmamba +Distribution: openmamba +Packager: Silvan Calarco +URL: https://www.boost.org/ +Source: https://boostorg.jfrog.io/artifactory/main/release/%{version}/source/boost_%{pckver}.tar.bz2 +Patch0: libboost185-1.85.0-python-numpy-2.1.1.patch +License: Boost Software License +## AUTOBUILDREQ-BEGIN +BuildRequires: glibc-devel +BuildRequires: libbzip2-devel +BuildRequires: libgcc +BuildRequires: libicu-devel +BuildRequires: liblzma-devel +BuildRequires: libmpi-devel +BuildRequires: libquadmath-devel +BuildRequires: libstdc++6-devel +BuildRequires: libz-devel +BuildRequires: libzstd-devel +## AUTOBUILDREQ-END +BuildRequires: libbacktrace-devel +BuildRequires: libicu-devel >= 67.1 +BuildRequires: libpython3-devel >= 3.11 +BuildRequires: python-numpy-py3 +BuildRequires: openmpi-devel + +%description +The Boost libraries provide free peer-reviewed portable C++ source libraries. +The emphasis is on libraries which work well with the C++ Standard Library. +The libraries are intended to be widely useful, and are in regular use by thousands of programmers across a broad spectrum of applications. + +A further goal is to establish "existing practice" and provide reference implementations so that Boost libraries are suitable for eventual standardization. +Ten Boost libraries will be included in the C++ Standards Committee's upcoming C++ Standard Library Technical Report as a step toward becoming part of a future C++ Standard. + +%package devel +Group: Development/Libraries +Summary: Devel package for libboost +Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} +Requires: python-boost185-py3 = %{?epoch:%epoch:}%{version}-%{release} + +%description devel +The Boost libraries provide free peer-reviewed portable C++ source libraries. +The emphasis is on libraries which work well with the C++ Standard Library. +The libraries are intended to be widely useful, and are in regular use by thousands of programmers across a broad spectrum of applications. +A further goal is to establish "existing practice" and provide reference implementations so that Boost libraries are suitable for eventual standardization. +Ten Boost libraries will be included in the C++ Standards Committee's upcoming C++ Standard Library Technical Report as a step toward becoming part of a future C++ Standard. +This is the devel package. + +%package -n python-boost185-py3 +Group: System/Libraries +Summary: Boost.Python library for Python 3 +Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} + +%description -n python-boost185-py3 +The Boost libraries provides free peer-reviewed portable C++ source libraries. +The emphasis is on libraries which work well with the C++ Standard Library. +The libraries are intended to be widely useful, and are in regular use by thousands of programmers across a broad spectrum of applications. +A further goal is to establish "existing practice" and provide reference implementations so that Boost libraries are suitable for eventual standardization. +Ten Boost libraries will be included in the C++ Standards Committee's upcoming C++ Standard Library Technical Report as a step toward becoming part of a future C++ Standard. +This package contains then Boost.python library for Python 3. + +%debug_package + +%prep +%setup -q -n boost_%{pckver} +#-D -T +#:<< _EOF +%patch 0 -p1 -b .python-numpy-2.1.1 + +%build +#:<< _EOF +# Build boost with python3 +./bootstrap.sh \ + --with-icu \ + --with-python-root=%{_prefix} \ + --with-python-version=%{python3_version} + +sed -i "s|using python.*|using python : %{python3_version} : %{_prefix} : %{python3_inc} ;|" project-config.jam +echo "using mpi ;" >> project-config.jam + +EXPAT_INCLUDE=%{_includedir} \ +EXPAT_LIBPATH=%{_libdir} \ +./b2 \ + --prefix=%{_prefix} \ + --layout=system -d2 \ + python=%{python3_version} \ + runtime-link=shared \ + link=shared,static \ + toolset=gcc \ + variant=release \ + threading=multi \ + debug-symbols=on \ +%ifarch x86_64 + cflags="-fPIC" \ +%endif +%ifarch %{ix86} aarch64 + boost.stacktrace.from_exception=off \ +%endif + stage + +%install +[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" +EXPAT_INCLUDE=%{_includedir} \ +EXPAT_LIBPATH=%{_libdir} \ +./b2 \ + --prefix=%{buildroot}%{_prefix} \ + --libdir=%{buildroot}%{_libdir} \ + --execprefix=%{buildroot}%{_libexecdir} \ + --includedir=%{buildroot}%{_includedir} \ + --layout=system -d2 \ + python=%{python3_version} \ + runtime-link=shared \ + link=shared,static \ + toolset=gcc \ + variant=release \ + threading=multi \ + debug-symbols=on \ +%ifarch x86_64 + cflags="-fPIC" \ +%endif +%ifarch %{ix86} aarch64 + boost.stacktrace.from_exception=off \ +%endif + install + +# https://github.com/boostorg/python/issues/203#issuecomment-391477685 +for _lib in python mpi_python numpy; do + ln -srL %{buildroot}%{_libdir}/libboost_${_lib}3{11,}.so +done + +rm -f %{buildroot}%{_libdir}/boost-python*/mpi.so + +%clean +[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" + +%files +%defattr(-,root,root) +%{_libdir}/libboost_*.so.* +%exclude %{_libdir}/libboost_python3*.so.* +%exclude %{_libdir}/libboost_mpi_python3*.so.* +%exclude %{_libdir}/libboost_numpy3*.so.* +%doc LICENSE_1_0.txt + +%files devel +%defattr(-,root,root) +%dir %{_includedir}/boost +%{_includedir}/boost/* +%{_libdir}/libboost_*.so +%{_libdir}/libboost_*.a +%dir %{_libdir}/cmake/Boost-%{version} +%{_libdir}/cmake/Boost-%{version}/Boost*.cmake +%{_libdir}/cmake/Boost*.cmake +%{_libdir}/cmake/boost_*/*.cmake + +%files -n python-boost185-py3 +%defattr(-,root,root) +%{_libdir}/libboost_python311.so.* +%{_libdir}/libboost_mpi_python311.so.* +%{_libdir}/libboost_numpy311.so.* + +%changelog +* Wed Sep 18 2024 Silvan Calarco 1.85.0-6mamba +- remove conflicting mpi.so in python package + +* Mon Sep 16 2024 Silvan Calarco 1.85.0-5mamba +- legacy package + +* Mon May 06 2024 Silvan Calarco 1.85.0-4mamba +- remove and provide/obsolete boost-jam requirement + +* Mon Apr 22 2024 Automatic Build System 1.85.0-3mamba +- aarch64: rebuilt with libbacktrace + +* Sat Apr 20 2024 Silvan Calarco 1.85.0-2mamba +- remove and obsolete python-boost-py310 + +* Wed Apr 17 2024 Automatic Build System 1.85.0-1mamba +- automatic version update by autodist + +* Fri Dec 15 2023 Automatic Build System 1.84.0-1mamba +- automatic version update by autodist + +* Fri Oct 13 2023 Silvan Calarco 1.83.0-2mamba +- rebuilt with python3 == 3.11 + +* Sat Aug 12 2023 Automatic Build System 1.83.0-1mamba +- automatic version update by autodist + +* Sat Apr 15 2023 Automatic Build System 1.82.0-1mamba +- automatic version update by autodist + +* Thu Mar 30 2023 Silvan Calarco 1.81.0-2mamba +- added python-boost-py310 subpackage for python 3.10 support + +* Sat Dec 17 2022 Automatic Build System 1.81.0-1mamba +- automatic version update by autodist + +* Thu Aug 11 2022 Automatic Build System 1.80.0-1mamba +- automatic version update by autodist + +* Fri Apr 15 2022 Automatic Build System 1.79.0-1mamba +- automatic version update by autodist + +* Sun Mar 20 2022 Silvan Calarco 1.78.0-2mamba +- exclude duplicated python libraries from main package + +* Mon Jan 03 2022 Silvan Calarco 1.78.0-1mamba +- update to 1.78.0 + +* Tue Apr 20 2021 Automatic Build System 1.76.0-1mamba +- automatic version update by autodist + +* Tue Jan 19 2021 Silvan Calarco 1.75.0-2mamba +- libboost-devel: restore libboost_[python|numpy]3.so symlinks + +* Fri Jan 15 2021 Automatic Build System 1.75.0-1mamba +- automatic version update by autodist + +* Sun Sep 06 2020 Silvan Calarco 1.72.0-2mamba +- rebuilt with libicu 67.1 + +* Fri Jan 31 2020 Automatic Build System 1.72.0-1mamba +- automatic version update by autodist + +* Mon Dec 23 2019 Silvan Calarco 1.71.0-5mamba +- python-boost-py3: don't obsolete python3-boost provided by legacy package + +* Sun Dec 22 2019 Silvan Calarco 1.71.0-4mamba +- added python-boost-py36 package, rename python3-boost to python-boost-py3 + +* Wed Nov 27 2019 Silvan Calarco 1.71.0-3mamba +- fix build for python3 + +* Fri Nov 22 2019 Silvan Calarco 1.71.0-2mamba +- rebuilt with debug package and python3 + +* Sat Oct 26 2019 Silvan Calarco 1.71.0-1mamba +- update to 1.71.0 + +* Mon Feb 11 2019 Silvan Calarco 1.69.0-2mamba +- rebuilt with --threading=multi and --layout=system + +* Tue Jan 22 2019 Automatic Build System 1.69.0-1mamba +- automatic version update by autodist + +* Fri Oct 05 2018 Automatic Build System 1.68.0-1mamba +- automatic version update by autodist + +* Sat Sep 01 2018 Silvan Calarco 1.66.0-2mamba +- move mpi.so from devel to main package + +* Sat Jan 06 2018 Automatic Build System 1.66.0-1mamba +- automatic version update by autodist + +* Thu Sep 21 2017 Automatic Build System 1.65.1-1mamba +- automatic version update by autodist + +* Fri Feb 24 2017 Automatic Build System 1.63.0-1mamba +- automatic version update by autodist + +* Sun Oct 30 2016 Automatic Build System 1.62.0-1mamba +- automatic version update by autodist + +* Sat Sep 10 2016 Automatic Build System 1.61.0-1mamba +- automatic version update by autodist + +* Sat Jan 16 2016 Automatic Build System 1.60.0-1mamba +- automatic version update by autodist + +* Thu Dec 17 2015 Silvan Calarco 1.59.0-2mamba +- rebuilt with gcc 5.3.0 + +* Wed Oct 28 2015 Automatic Build System 1.59.0-1mamba +- automatic version update by autodist + +* Thu Apr 30 2015 Automatic Build System 1.58.0-1mamba +- automatic version update by autodist + +* Sat Apr 11 2015 Silvan Calarco 1.57.0-4mamba +- patch to fix qt4 moc (kdepim 4.14.6) + +* Thu Feb 05 2015 Silvan Calarco 1.57.0-3mamba +- fix python3 module + +* Wed Feb 04 2015 Silvan Calarco 1.57.0-2mamba +- rebuilt adding python3-boost and python3-boost-devel + +* Sat Nov 22 2014 Automatic Build System 1.57.0-1mamba +- automatic version update by autodist + +* Thu Oct 09 2014 Silvan Calarco 1.55.0-2mamba +- rebuilt with libicu 53 + +* Sat Nov 30 2013 Silvan Calarco 1.55.0-1mamba +- update to 1.55.0 + +* Sat Jul 13 2013 Automatic Build System 1.54.0-1mamba +- automatic version update by autodist + +* Sat Mar 30 2013 Automatic Build System 1.53.0-1mamba +- automatic version update by autodist + +* Mon Dec 24 2012 Silvan Calarco 1.52.0-2mamba +- fix adding locales library (added --with-libraries=all to bootstrap.sh) + +* Sat Dec 15 2012 Silvan Calarco 1.52.0-1mamba +- update to 1.52.0 +- add --with-locale required by blender 2.65 + +* Mon Jul 30 2012 Silvan Calarco 1.50.0-1mamba +- update to 1.50.0 + +* Fri Jun 29 2012 Silvan Calarco 1.45.0-2mamba +- added patch to fix thread support with gcc >= 4.7 + +* Tue Dec 14 2010 Silvan Calarco 1.45.0-1mamba +- update to 1.45.0 + +* Tue Jun 29 2010 Automatic Build System 1.43.0-2mamba +- automatic rebuild by autodist + +* Thu Jun 10 2010 Automatic Build System 1.43.0-1mamba +- update to 1.43.0 + +* Thu Jun 25 2009 Silvan Calarco 1.39.0-3mamba +- added no_exception patch to serialization/throw_exception.hpp (see http://marc.info/?l=boost&m=123972460823115&w=2) + +* Thu Jun 04 2009 Silvan Calarco 1.39.0-2mamba +- re-enable ICU support and threading variants + +* Thu Jun 04 2009 Silvan Calarco 1.39.0-1mamba +- update to 1.39.0 + +* Tue Mar 31 2009 Silvan Calarco 1.38.0-1mamba +- update to 1.38.0 +- python packages renamed to python-boost* + +* Wed Feb 04 2009 Silvan Calarco 1.37.0-1mamba +- automatic update by autodist + +* Tue Oct 28 2008 Silvan Calarco 1.36.0-2mamba +- rebuilt against python 2.6 + +* Fri Sep 12 2008 gil 1.36.0-1mamba +- update to 1.36.0 + +* Mon Jul 21 2008 gil 1.35.0-1mamba +- update to 1.35.0 +- edit patch0 + +* Sun Oct 14 2007 Silvan Calarco 1.34.1-1mamba +- update to 1.34.1 + +* Mon Jul 02 2007 Silvan Calarco 1.34.0-1mamba +- update to 1.34.0 + +* Fri Apr 27 2007 Silvan Calarco 1.33.1-1mamba +- update to 1.33.1 + +* Tue Feb 22 2005 Davide Madrisan 1.32.0-1qilnx +- update to version 1.32.0 by autospec +- package license modified +- added license file in the package documentation +- specfile updates +- fixes in the install section +- added missing header files + +* Tue Jun 29 2004 Silvan Calarco 1.31.0-1qilnx +- first build