From 78634bafca32ec2d8ab6ba401c20369a751ac4216865bd942ccb74ce80d0ce7f Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 30 May 2023 11:53:04 +0000 Subject: [PATCH] Accepting request 1089783 from home:Andreas_Schwab:Factory - python-2.7.5-multilib.patch: Update for riscv64 - Don't fail if _ctypes or dl extension was not built OBS-URL: https://build.opensuse.org/request/show/1089783 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=364 --- python-2.7.5-multilib.patch | 2 +- python-base.changes | 6 ++++++ python-base.spec | 2 +- python-doc.changes | 6 ++++++ python.changes | 6 ++++++ python.spec | 2 +- 6 files changed, 21 insertions(+), 3 deletions(-) diff --git a/python-2.7.5-multilib.patch b/python-2.7.5-multilib.patch index ed4020f..f129fc7 100644 --- a/python-2.7.5-multilib.patch +++ b/python-2.7.5-multilib.patch @@ -375,7 +375,7 @@ +esac + +case $ARCH:$python_cv_cc_64bit_output in -+aarch64:yes | ppc64:yes | ppc64le:yes | powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes) ++aarch64:yes | ppc64:yes | ppc64le:yes | powerpc64:yes | riscv64:yes | s390x:yes | sparc64:yes | x86_64:yes) + LIB="lib64" + ;; +*:*) diff --git a/python-base.changes b/python-base.changes index 588d1d9..dea7d54 100644 --- a/python-base.changes +++ b/python-base.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 30 10:43:13 UTC 2023 - Andreas Schwab + +- python-2.7.5-multilib.patch: Update for riscv64 +- Don't fail if _ctypes or dl extension was not built + ------------------------------------------------------------------- Mon May 29 18:49:40 UTC 2023 - Matej Cepl diff --git a/python-base.spec b/python-base.spec index 975c76d..35fd910 100644 --- a/python-base.spec +++ b/python-base.spec @@ -585,7 +585,7 @@ cp Makefile Makefile.pre.in Makefile.pre %{buildroot}%{_libdir}/python%{python_v %{_libdir}/python%{python_version}/lib-dynload/_multibytecodec.so %{_libdir}/python%{python_version}/lib-dynload/Python-%{tarversion}-py%{python_version}.egg-info # these modules don't support 64-bit arches (disabled by setup.py) -%ifnarch alpha ia64 x86_64 s390x ppc64 ppc64le sparc64 aarch64 +%ifnarch alpha ia64 x86_64 s390x ppc64 ppc64le sparc64 aarch64 riscv64 # requires sizeof(int) == sizeof(long) == sizeof(char*) %{_libdir}/python%{python_version}/lib-dynload/dl.so %endif diff --git a/python-doc.changes b/python-doc.changes index 588d1d9..dea7d54 100644 --- a/python-doc.changes +++ b/python-doc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 30 10:43:13 UTC 2023 - Andreas Schwab + +- python-2.7.5-multilib.patch: Update for riscv64 +- Don't fail if _ctypes or dl extension was not built + ------------------------------------------------------------------- Mon May 29 18:49:40 UTC 2023 - Matej Cepl diff --git a/python.changes b/python.changes index 588d1d9..dea7d54 100644 --- a/python.changes +++ b/python.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 30 10:43:13 UTC 2023 - Andreas Schwab + +- python-2.7.5-multilib.patch: Update for riscv64 +- Don't fail if _ctypes or dl extension was not built + ------------------------------------------------------------------- Mon May 29 18:49:40 UTC 2023 - Matej Cepl diff --git a/python.spec b/python.spec index 1af67a4..108221b 100644 --- a/python.spec +++ b/python.spec @@ -460,7 +460,7 @@ rm %{buildroot}%{_libdir}/python%{python_version}/site-packages/README rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_bisect.so rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_csv.so rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_collections.so -rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_ctypes.so +rm -f %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_ctypes.so rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_ctypes_test.so rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_elementtree.so rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_functools.so