Update to 3.10.0a6
This commit is contained in:
Tomas Hrnciar
parent
4a2922475a
commit
87f3cf679a
@ -1,75 +0,0 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Malcolm <dmalcolm@redhat.com>
|
|
||||||
Date: Mon, 18 Jan 2010 17:59:07 +0000
|
|
||||||
Subject: [PATCH] 00111: Don't try to build a libpythonMAJOR.MINOR.a
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Downstream only: not appropriate for upstream.
|
|
||||||
|
|
||||||
See https://bugzilla.redhat.com/show_bug.cgi?id=556092
|
|
||||||
|
|
||||||
Co-authored-by: David Malcolm <dmalcolm@redhat.com>
|
|
||||||
Co-authored-by: Bohuslav Kabrda <bkabrda@redhat.com>
|
|
||||||
Co-authored-by: Matej Stuchlik <mstuchli@redhat.com>
|
|
||||||
Co-authored-by: Robert Kuska <rkuska@redhat.com>
|
|
||||||
Co-authored-by: Charalampos Stratakis <cstratak@redhat.com>
|
|
||||||
Co-authored-by: Miro Hrončok <miro@hroncok.cz>
|
|
||||||
---
|
|
||||||
Makefile.pre.in | 21 ++-------------------
|
|
||||||
1 file changed, 2 insertions(+), 19 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
|
||||||
index 0b22bdd559..dfd21d837f 100644
|
|
||||||
--- a/Makefile.pre.in
|
|
||||||
+++ b/Makefile.pre.in
|
|
||||||
@@ -578,7 +578,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c
|
|
||||||
$(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py --make --srcdir $(srcdir)
|
|
||||||
|
|
||||||
# Build the interpreter
|
|
||||||
-$(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) $(EXPORTSYMS)
|
|
||||||
+$(BUILDPYTHON): Programs/python.o $(LDLIBRARY) $(PY3LIBRARY) $(EXPORTSYMS)
|
|
||||||
$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
|
|
||||||
|
|
||||||
platform: $(BUILDPYTHON) pybuilddir.txt
|
|
||||||
@@ -626,12 +626,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
|
|
||||||
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
|
|
||||||
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
|
|
||||||
|
|
||||||
-
|
|
||||||
-# Build static library
|
|
||||||
-$(LIBRARY): $(LIBRARY_OBJS)
|
|
||||||
- -rm -f $@
|
|
||||||
- $(AR) $(ARFLAGS) $@ $(LIBRARY_OBJS)
|
|
||||||
-
|
|
||||||
libpython$(LDVERSION).so: $(LIBRARY_OBJS) $(DTRACE_OBJS)
|
|
||||||
if test $(INSTSONAME) != $(LDLIBRARY); then \
|
|
||||||
$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM); \
|
|
||||||
@@ -713,7 +707,7 @@ Makefile Modules/config.c: Makefile.pre \
|
|
||||||
@echo "The Makefile was updated, you may need to re-run make."
|
|
||||||
|
|
||||||
|
|
||||||
-Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) $(EXPORTSYMS)
|
|
||||||
+Programs/_testembed: Programs/_testembed.o $(LDLIBRARY) $(PY3LIBRARY) $(EXPORTSYMS)
|
|
||||||
$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
|
|
||||||
|
|
||||||
############################################################################
|
|
||||||
@@ -1661,17 +1655,6 @@ libainstall: @DEF_MAKE_RULE@ python-config
|
|
||||||
else true; \
|
|
||||||
fi; \
|
|
||||||
done
|
|
||||||
- @if test -d $(LIBRARY); then :; else \
|
|
||||||
- if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
|
|
||||||
- if test "$(SHLIB_SUFFIX)" = .dll; then \
|
|
||||||
- $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
|
|
||||||
- else \
|
|
||||||
- $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
|
|
||||||
- fi; \
|
|
||||||
- else \
|
|
||||||
- echo Skip install of $(LIBRARY) - use make frameworkinstall; \
|
|
||||||
- fi; \
|
|
||||||
- fi
|
|
||||||
$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
|
|
||||||
$(INSTALL_DATA) Programs/python.o $(DESTDIR)$(LIBPL)/python.o
|
|
||||||
$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
|
|
||||||
@ -14,7 +14,7 @@ URL: https://www.python.org/
|
|||||||
# WARNING When rebasing to a new Python version,
|
# WARNING When rebasing to a new Python version,
|
||||||
# remember to update the python3-docs package as well
|
# remember to update the python3-docs package as well
|
||||||
%global general_version %{pybasever}.0
|
%global general_version %{pybasever}.0
|
||||||
%global prerel a5
|
%global prerel a6
|
||||||
%global upstream_version %{general_version}%{?prerel}
|
%global upstream_version %{general_version}%{?prerel}
|
||||||
Version: %{general_version}%{?prerel:~%{prerel}}
|
Version: %{general_version}%{?prerel:~%{prerel}}
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
@ -266,14 +266,6 @@ Source11: idle3.appdata.xml
|
|||||||
# Was Patch0 in ivazquez' python3000 specfile
|
# Was Patch0 in ivazquez' python3000 specfile
|
||||||
Patch1: 00001-rpath.patch
|
Patch1: 00001-rpath.patch
|
||||||
|
|
||||||
# 00111 # 93b40d73360053ca68b0aeec33b6a8ca167e33e2
|
|
||||||
# Don't try to build a libpythonMAJOR.MINOR.a
|
|
||||||
#
|
|
||||||
# Downstream only: not appropriate for upstream.
|
|
||||||
#
|
|
||||||
# See https://bugzilla.redhat.com/show_bug.cgi?id=556092
|
|
||||||
Patch111: 00111-no-static-lib.patch
|
|
||||||
|
|
||||||
# 00251 # 5c445123f04d96be42a35eef5119378ba1713a96
|
# 00251 # 5c445123f04d96be42a35eef5119378ba1713a96
|
||||||
# Change user install location
|
# Change user install location
|
||||||
#
|
#
|
||||||
@ -714,6 +706,7 @@ BuildPython() {
|
|||||||
--with-dtrace \
|
--with-dtrace \
|
||||||
--with-lto \
|
--with-lto \
|
||||||
--with-ssl-default-suites=openssl \
|
--with-ssl-default-suites=openssl \
|
||||||
|
--without-static-libpython \
|
||||||
%if %{with rpmwheels}
|
%if %{with rpmwheels}
|
||||||
--with-wheel-pkg-dir=%{_datadir}/python-wheels \
|
--with-wheel-pkg-dir=%{_datadir}/python-wheels \
|
||||||
%endif
|
%endif
|
||||||
@ -1064,8 +1057,10 @@ CheckPython() {
|
|||||||
# test_distutils
|
# test_distutils
|
||||||
# distutils.tests.test_bdist_rpm tests fail when bootstraping the Python
|
# distutils.tests.test_bdist_rpm tests fail when bootstraping the Python
|
||||||
# package: rpmbuild requires /usr/bin/pythonX.Y to be installed
|
# package: rpmbuild requires /usr/bin/pythonX.Y to be installed
|
||||||
|
# test_frozentable fails with Python 3.10.0a6 (https://bugs.python.org/issue43372)
|
||||||
LD_LIBRARY_PATH=$ConfDir $ConfDir/python -m test.regrtest \
|
LD_LIBRARY_PATH=$ConfDir $ConfDir/python -m test.regrtest \
|
||||||
-wW --slowest -j0 --timeout=1800 \
|
-wW --slowest -j0 --timeout=1800 \
|
||||||
|
-i test_frozentable \
|
||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
-x test_distutils \
|
-x test_distutils \
|
||||||
%endif
|
%endif
|
||||||
@ -1582,6 +1577,9 @@ CheckPython optimized
|
|||||||
# ======================================================
|
# ======================================================
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Mar 02 2021 Tomas Hrnciar <thrnciar@redhat.com> - 3.10.0~a6-1
|
||||||
|
- Update to 3.10.0a6
|
||||||
|
|
||||||
* Wed Feb 3 15:01:21 CET 2021 Tomas Hrnciar <thrnciar@redhat.com> - 3.10.0~a5-1
|
* Wed Feb 3 15:01:21 CET 2021 Tomas Hrnciar <thrnciar@redhat.com> - 3.10.0~a5-1
|
||||||
- Update to 3.10.0a5
|
- Update to 3.10.0a5
|
||||||
|
|
||||||
|
|||||||
4
sources
4
sources
@ -1,2 +1,2 @@
|
|||||||
SHA512 (Python-3.10.0a5.tar.xz) = d686f9044ea964af2b5556068c0d804511d3148b455643d06a8b566f265a5fa9a9a3713ff0c3fee2c0da9bba33b913983ea4fcb22d679cfdcb83c6de32aa575e
|
SHA512 (Python-3.10.0a6.tar.xz) = b405e4d0294306ceab205ba98b6f34a0384993a2eff93b75974bb9bfc25599ab594ef98c633de9db77de11cef11f03e4c9b5090f985cc00e8b9dec39003997a6
|
||||||
SHA512 (Python-3.10.0a5.tar.xz.asc) = 4f1fe9b42830c89cb35ea1634fd7484f3bbf7ff22868c71fadc0601c3b02ff2ea386cfbc7ea167a2770d732aa01532fb7d4abb198a07e4710565e3eec138408c
|
SHA512 (Python-3.10.0a6.tar.xz.asc) = 4f6e86afd09622a461d712b32fb48ba76c37dbc807d84cd375be4afed53b43ca4e0027a816383323d8ccd334845a2e5337ba15a83097a0e0df9270f439b1964e
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user