From 708c95486dc3973f72450c9f190c489a35abda64 Mon Sep 17 00:00:00 2001 From: Christopher Co <35273088+christopherco@users.noreply.github.com> Date: Tue, 14 Dec 2021 17:35:51 -0800 Subject: [PATCH] [main] numpy: fix build break in install_clib (#1768) * numpy: fix build break in install_clib There is a known install stage build break on install_clib when building numpy 1.16 with python3. See github issue: https://github.com/numpy/numpy/issues/13265 The fix for this issue is present in 1.17+, so this commit backports the patch to 1.16. * numpy: fix lint Signed-off-by: Chris Co --- SPECS/numpy/fix-setup-py-install.patch | 23 +++++++ SPECS/numpy/numpy.spec | 87 ++++++++++++++++---------- 2 files changed, 76 insertions(+), 34 deletions(-) create mode 100644 SPECS/numpy/fix-setup-py-install.patch diff --git a/SPECS/numpy/fix-setup-py-install.patch b/SPECS/numpy/fix-setup-py-install.patch new file mode 100644 index 0000000000..aa141de27f --- /dev/null +++ b/SPECS/numpy/fix-setup-py-install.patch @@ -0,0 +1,23 @@ +From b8e741c66f71071c3406e592e1537570731bcb35 Mon Sep 17 00:00:00 2001 +From: mattip +Date: Sun, 26 May 2019 08:55:53 +0300 +Subject: [PATCH] BUG: setup.py install --skip-build fails + +--- + numpy/distutils/command/install_clib.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/numpy/distutils/command/install_clib.py b/numpy/distutils/command/install_clib.py +index 662aa00bda9..6a73f7e3308 100644 +--- a/numpy/distutils/command/install_clib.py ++++ b/numpy/distutils/command/install_clib.py +@@ -19,6 +19,9 @@ def finalize_options(self): + + def run (self): + build_clib_cmd = get_cmd("build_clib") ++ if not build_clib_cmd.build_clib: ++ # can happen if the user specified `--skip-build` ++ build_clib_cmd.finalize_options() + build_dir = build_clib_cmd.build_clib + + # We need the compiler to get the library name -> filename association diff --git a/SPECS/numpy/numpy.spec b/SPECS/numpy/numpy.spec index 57bd9c895d..34ce9fd1ba 100644 --- a/SPECS/numpy/numpy.spec +++ b/SPECS/numpy/numpy.spec @@ -1,20 +1,21 @@ Summary: Array processing for numbers, strings, records, and objects Name: numpy Version: 1.16.6 -Release: 2%{?dist} +Release: 3%{?dist} # The custom license is inside numpy/core/src/multiarray/dragon4.c. -License: BSD and ZLIB custom +License: BSD AND ZLIB custom Vendor: Microsoft Corporation Distribution: Mariner Group: Development/Languages/Python -Url: https://numpy.org/ +URL: https://numpy.org/ Source0: https://github.com/numpy/numpy/releases/download/v%{version}/%{name}-%{version}.tar.gz +Patch0: fix-setup-py-install.patch BuildRequires: lapack-devel -BuildRequires: unzip BuildRequires: python3 BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-xml +BuildRequires: unzip %if %{with_check} BuildRequires: curl-devel BuildRequires: openssl-devel @@ -28,20 +29,21 @@ NumPy is a general-purpose array-processing package designed to efficiently mani Summary: python-numpy Requires: python3 Requires: python3-libs + %description -n python3-numpy Python 3 version. %package -n python3-numpy-f2py Summary: f2py for numpy -Requires: python3-numpy = %{version}-%{release} Requires: python3-devel +Requires: python3-numpy = %{version}-%{release} Provides: python3-f2py = %{version}-%{release} + %description -n python3-numpy-f2py This package includes a version of f2py that works properly with NumPy. - %prep -%setup -q +%autosetup -p1 %build # xlocale.h has been removed from glibc 2.26 @@ -66,38 +68,55 @@ rm -rf test %{_bindir}/f2py3 %files -n python3-numpy-f2py +%{_bindir}/f2py %{_bindir}/f2py3 %{_bindir}/f2py%{python3_version} %changelog +* Tue Dec 14 2021 Chris Co - 1.16.6-3 +- Backport patch to fix python3 setup.py install error +- Add f2py to packaging + * Fri Dec 03 2021 Thomas Crain - 1.16.6-2 - Remove python2 subpackage - Replace easy_insall usage with pip in %%check section -* Mon Jun 08 2020 Paul Monson 1.16.6-1 -- Update to 1.16.6 to fix CVE-2019-6446 -* Sat May 09 2020 Nick Samson 1.15.1-6 -- Added %%license line automatically -* Wed Apr 29 2020 Emre Girgin 1.15.1-5 -- Renaming python-numpy to numpy -* Mon Apr 27 2020 Pawel Winogrodzki 1.15.1-4 -- Fixed 'Source0' and 'URL' tags. -- License verified. -* Tue Sep 03 2019 Mateusz Malisz 1.15.1-3 -- Initial CBL-Mariner import from Photon (license: Apache2). -* Mon Dec 03 2018 Tapas Kundu 1.15.1-2 -- Fixed make check -* Sun Sep 09 2018 Tapas Kundu 1.15.1-1 -- Update to version 1.15.1 -* Fri Aug 25 2017 Alexey Makhalov 1.12.1-5 -- Fix compilation issue for glibc-2.26 -* Wed Jul 26 2017 Divya Thaluru 1.12.1-4 -- Fixed rpm check errors -* Wed Jun 07 2017 Xiaolin Li 1.12.1-3 -- Add python3-setuptools and python3-xml to python3 sub package Buildrequires. -* Thu May 04 2017 Sarah Choi 1.12.1-2 -- Fix typo in Source0 -* Thu Mar 30 2017 Sarah Choi 1.12.1-1 -- Upgrade version to 1.12.1 -* Thu Mar 02 2017 Xiaolin Li 1.8.2-1 -- Initial packaging for Photon +* Mon Jun 08 2020 Paul Monson - 1.16.6-1 +- Update to 1.16.6 to fix CVE-2019-6446 + +* Sat May 09 2020 Nick Samson - 1.15.1-6 +- Added %%license line automatically + +* Wed Apr 29 2020 Emre Girgin - 1.15.1-5 +- Renaming python-numpy to numpy + +* Mon Apr 27 2020 Pawel Winogrodzki - 1.15.1-4 +- Fixed 'Source0' and 'URL' tags. +- License verified. + +* Tue Sep 03 2019 Mateusz Malisz - 1.15.1-3 +- Initial CBL-Mariner import from Photon (license: Apache2). + +* Mon Dec 03 2018 Tapas Kundu - 1.15.1-2 +- Fixed make check + +* Sun Sep 09 2018 Tapas Kundu - 1.15.1-1 +- Update to version 1.15.1 + +* Fri Aug 25 2017 Alexey Makhalov - 1.12.1-5 +- Fix compilation issue for glibc-2.26 + +* Wed Jul 26 2017 Divya Thaluru - 1.12.1-4 +- Fixed rpm check errors + +* Wed Jun 07 2017 Xiaolin Li - 1.12.1-3 +- Add python3-setuptools and python3-xml to python3 sub package Buildrequires. + +* Thu May 04 2017 Sarah Choi - 1.12.1-2 +- Fix typo in Source0 + +* Thu Mar 30 2017 Sarah Choi - 1.12.1-1 +- Upgrade version to 1.12.1 + +* Thu Mar 02 2017 Xiaolin Li - 1.8.2-1 +- Initial packaging for Photon