rpms/python3.12
15
0
Fork 0
Code Issues Pull Requests Releases Activity

Use python3 style of calling super() without arguments in rpath patch

Browse Source
This commit is contained in:
Michal Cyprian 2017-08-30 14:52:53 +02:00 committed by Petr Viktorin
parent b7855d3644
commit eef42fd7ea
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Python-3.1.1-rpath.patch
View File

@ -1,15 +1,14 @@
diff -up Python-3.1.1/Lib/distutils/unixccompiler.py.rpath Python-3.1.1/Lib/distutils/unixccompiler.py diff -up Python-3.1.1/Lib/distutils/unixccompiler.py.rpath Python-3.1.1/Lib/distutils/unixccompiler.py
--- Python-3.1.1/Lib/distutils/unixccompiler.py.rpath 2009-09-04 17:29:34.000000000 -0400 --- Python-3.1.1/Lib/distutils/unixccompiler.py.rpath 2009-09-04 17:29:34.000000000 -0400
+++ Python-3.1.1/Lib/distutils/unixccompiler.py 2009-09-04 17:49:54.000000000 -0400 +++ Python-3.1.1/Lib/distutils/unixccompiler.py 2009-09-04 17:49:54.000000000 -0400
@@ -141,6 +141,16 @@ class UnixCCompiler(CCompiler): @@ -141,6 +141,15 @@ class UnixCCompiler(CCompiler):
if sys.platform == "cygwin": if sys.platform == "cygwin":
exe_extension = ".exe" exe_extension = ".exe"
+ def _fix_lib_args(self, libraries, library_dirs, runtime_library_dirs): + def _fix_lib_args(self, libraries, library_dirs, runtime_library_dirs):
+ """Remove standard library path from rpath""" + """Remove standard library path from rpath"""
+ libraries, library_dirs, runtime_library_dirs = super( + libraries, library_dirs, runtime_library_dirs = super()._fix_lib_args(
+ self.__class__, self)._fix_lib_args(libraries, library_dirs, + libraries, library_dirs, runtime_library_dirs)
+ runtime_library_dirs)
+ libdir = sysconfig.get_config_var('LIBDIR') + libdir = sysconfig.get_config_var('LIBDIR')
+ if runtime_library_dirs and (libdir in runtime_library_dirs): + if runtime_library_dirs and (libdir in runtime_library_dirs):
+ runtime_library_dirs.remove(libdir) + runtime_library_dirs.remove(libdir)

7
python3.spec
View File

@ -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
Version: %{pybasever}.2 Version: %{pybasever}.2
Release: 11%{?dist} Release: 12%{?dist}
License: Python License: Python
@ -1665,6 +1665,11 @@ fi
# ====================================================== # ======================================================
%changelog %changelog
* Mon Aug 28 2017 Michal Cyprian <mcyprian@redhat.com> - 3.6.2-12
- Use python3 style of calling super() without arguments in rpath
patch to prevent recursion in UnixCCompiler subclasses
Resolves: rhbz#1458122
* Mon Aug 21 2017 Petr Viktorin <pviktori@redhat.com> - 3.6.2-11 * Mon Aug 21 2017 Petr Viktorin <pviktori@redhat.com> - 3.6.2-11
- Add bcond for --without optimizations - Add bcond for --without optimizations
- Reword package descriptions - Reword package descriptions