Accepting request 934643 from devel:languages:python:Factory
- Remove shebangs from from python-base libraries in _libdir (bsc#1193179). - Readjust patches: - bpo-31046_ensurepip_honours_prefix.patch - decimal.patch - python-3.3.0b1-fix_date_time_compiler.patch - rpm-build-python dependency is available on the current Factory, not with SLE. OBS-URL: https://build.opensuse.org/request/show/934643 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python39?expand=0&rev=25
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
6f0c05a479
@ -55,7 +55,7 @@ Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com>
|
||||
.. note::
|
||||
--- a/Lib/ensurepip/__init__.py
|
||||
+++ b/Lib/ensurepip/__init__.py
|
||||
@@ -56,27 +56,27 @@ def _disable_pip_configuration_settings(
|
||||
@@ -52,27 +52,27 @@ def _disable_pip_configuration_settings(
|
||||
os.environ['PIP_CONFIG_FILE'] = os.devnull
|
||||
|
||||
|
||||
@ -88,7 +88,7 @@ Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com>
|
||||
|
||||
Note that calling this function will alter both sys.path and os.environ.
|
||||
"""
|
||||
@@ -119,6 +119,8 @@ def _bootstrap(*, root=None, upgrade=Fal
|
||||
@@ -115,6 +115,8 @@ def _bootstrap(*, root=None, upgrade=Fal
|
||||
args = ["install", "--no-cache-dir", "--no-index", "--find-links", tmpdir]
|
||||
if root:
|
||||
args += ["--root", root]
|
||||
@ -97,7 +97,7 @@ Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com>
|
||||
if upgrade:
|
||||
args += ["--upgrade"]
|
||||
if user:
|
||||
@@ -191,6 +193,11 @@ def _main(argv=None):
|
||||
@@ -187,6 +189,11 @@ def _main(argv=None):
|
||||
help="Install everything relative to this alternate root directory.",
|
||||
)
|
||||
parser.add_argument(
|
||||
@ -109,7 +109,7 @@ Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com>
|
||||
"--altinstall",
|
||||
action="store_true",
|
||||
default=False,
|
||||
@@ -209,6 +216,7 @@ def _main(argv=None):
|
||||
@@ -205,6 +212,7 @@ def _main(argv=None):
|
||||
|
||||
return _bootstrap(
|
||||
root=args.root,
|
||||
@ -139,7 +139,7 @@ Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com>
|
||||
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -1263,7 +1263,7 @@ install: @FRAMEWORKINSTALLFIRST@ commoni
|
||||
@@ -1262,7 +1262,7 @@ install: @FRAMEWORKINSTALLFIRST@ commoni
|
||||
install|*) ensurepip="" ;; \
|
||||
esac; \
|
||||
$(RUNSHARED) $(PYTHON_FOR_BUILD) -m ensurepip \
|
||||
@ -148,7 +148,7 @@ Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com>
|
||||
fi
|
||||
|
||||
altinstall: commoninstall
|
||||
@@ -1273,7 +1273,7 @@ altinstall: commoninstall
|
||||
@@ -1272,7 +1272,7 @@ altinstall: commoninstall
|
||||
install|*) ensurepip="--altinstall" ;; \
|
||||
esac; \
|
||||
$(RUNSHARED) $(PYTHON_FOR_BUILD) -m ensurepip \
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
if (sep == NULL) {
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -2201,7 +2201,7 @@ class PyBuildExt(build_ext):
|
||||
@@ -2203,7 +2203,7 @@ class PyBuildExt(build_ext):
|
||||
undef_macros = []
|
||||
if '--with-system-libmpdec' in sysconfig.get_config_var("CONFIG_ARGS"):
|
||||
include_dirs = []
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -782,11 +782,18 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
|
||||
@@ -781,11 +781,18 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
|
||||
$(DTRACE_OBJS) \
|
||||
$(srcdir)/Modules/getbuildinfo.c
|
||||
$(CC) -c $(PY_CORE_CFLAGS) \
|
||||
|
||||
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 29 00:17:07 UTC 2021 - Matej Cepl <mcepl@suse.com>
|
||||
|
||||
- Remove shebangs from from python-base libraries in _libdir
|
||||
(bsc#1193179).
|
||||
- Readjust patches:
|
||||
- bpo-31046_ensurepip_honours_prefix.patch
|
||||
- decimal.patch
|
||||
- python-3.3.0b1-fix_date_time_compiler.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 17 09:49:22 UTC 2021 - Steve Kowalik <steven.kowalik@suse.com>
|
||||
|
||||
@ -87,6 +97,12 @@ Wed Nov 17 09:49:22 UTC 2021 - Steve Kowalik <steven.kowalik@suse.com>
|
||||
+ bpo-44751: Remove crypt.h include from the public Python.h header.
|
||||
- Drop patch incorrect-deprecation-warn-asyncio.patch, fix included.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Nov 6 13:45:01 UTC 2021 - Matej Cepl <mcepl@suse.com>
|
||||
|
||||
- rpm-build-python dependency is available on the current
|
||||
Factory, not with SLE.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Oct 30 12:37:34 UTC 2021 - Matej Cepl <mcepl@suse.com>
|
||||
|
||||
|
||||
@ -124,13 +124,13 @@ Source100: PACKAGING-NOTES
|
||||
# to /usr/local if executable is /usr/bin/python* and RPM build
|
||||
# is not detected to make pip and distutils install into separate location
|
||||
Patch02: F00251-change-user-install-location.patch
|
||||
# PATCH-FEATURE-UPSTREAM distutils-reproducible-compile.patch gh#python/cpython#8057 mcepl@suse.com
|
||||
# Improve reproduceability
|
||||
Patch06: distutils-reproducible-compile.patch
|
||||
# PATCH-FEATURE-UPSTREAM decimal.patch bsc#1189356 mcepl@suse.com
|
||||
# fix building with mpdecimal
|
||||
# https://www.bytereef.org/contrib/decimal.diff
|
||||
Patch05: decimal.patch
|
||||
# PATCH-FEATURE-UPSTREAM distutils-reproducible-compile.patch gh#python/cpython#8057 mcepl@suse.com
|
||||
# Improve reproduceability
|
||||
Patch06: distutils-reproducible-compile.patch
|
||||
# support finding packages in /usr/local, install to /usr/local by default
|
||||
Patch07: python-3.3.0b1-localpath.patch
|
||||
# replace DATE, TIME and COMPILER by fixed definitions to aid reproducible builds
|
||||
@ -159,8 +159,6 @@ BuildRequires: lzma-devel
|
||||
BuildRequires: netcfg
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: pkgconfig
|
||||
# The provider for python(abi) is in rpm-build-python
|
||||
BuildRequires: rpm-build-python
|
||||
BuildRequires: xz
|
||||
BuildRequires: pkgconfig(bzip2)
|
||||
BuildRequires: pkgconfig(expat)
|
||||
@ -168,6 +166,10 @@ BuildRequires: pkgconfig(libffi)
|
||||
BuildRequires: pkgconfig(uuid)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
#!BuildIgnore: gdk-pixbuf-loader-rsvg
|
||||
%if 0%{?suse_version} >= 1550
|
||||
# The provider for python(abi) is in rpm-build-python
|
||||
BuildRequires: rpm-build-python
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1500
|
||||
BuildRequires: pkgconfig(libnsl)
|
||||
BuildRequires: pkgconfig(libtirpc)
|
||||
@ -412,6 +414,7 @@ other applications.
|
||||
# drop Autoconf version requirement
|
||||
sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac
|
||||
|
||||
%if %{primary_interpreter}
|
||||
# fix shebangs - convert /usr/local/bin/python and /usr/bin/env/python to /usr/bin/python3
|
||||
for dir in Lib Tools; do
|
||||
# find *.py, filter to files that contain bad shebangs
|
||||
@ -420,6 +423,13 @@ for dir in Lib Tools; do
|
||||
| xargs -0 grep -lE '^#! *(/''usr/.*bin/(env +)?)?python' \
|
||||
| xargs sed -r -i -e '1s@^#![[:space:]]*(/''usr/(local/)?bin/(env +)?)?python([0-9]+(\.[0-9]+)?)?@#!%{_bindir}/python3@'
|
||||
done
|
||||
%else
|
||||
# For non-primary Python, just don't bother (bsc#1193179) and remove all
|
||||
# those shebangs
|
||||
for dir in Lib Tools; do
|
||||
find $dir -name '*.py' -type f -exec sed -i '1{/^#!.*python/ d}' '{}' \;
|
||||
done
|
||||
%endif
|
||||
|
||||
# drop in-tree libffi and expat
|
||||
rm -r Modules/_ctypes/libffi* Modules/_ctypes/darwin
|
||||
|
||||
Loading…
Reference in New Issue
Block a user