Back to Bash wrapper, as upstream in 3.4 also uses Bash for some reasons
This reverts commit95a55939d7
. This reverts commit41a68301c7
.
This commit is contained in:
parent
41a68301c7
commit
8430e60b7b
11
config.py
11
config.py
@ -1,11 +0,0 @@
|
|||||||
#!/usr/bin/python3.4m
|
|
||||||
# -*- python -*-
|
|
||||||
|
|
||||||
import sys
|
|
||||||
import subprocess
|
|
||||||
ver = sys.version[:3]
|
|
||||||
arch = subprocess.check_output('uname -m'.split()).decode("utf-8").rstrip()
|
|
||||||
call = ['python{ver}m-{arch}-config'.format(ver=ver, arch=arch)] + sys.argv[1:]
|
|
||||||
retval = subprocess.call(call)
|
|
||||||
if retval == 127:
|
|
||||||
print('Could not find python{ver}m-{arch}-config. Look around to see available arches.'.format(ver=ver, arch=arch), file=sys.stderr)
|
|
15
python3.spec
15
python3.spec
@ -140,7 +140,7 @@
|
|||||||
Summary: Version 3 of the Python programming language aka Python 3000
|
Summary: Version 3 of the Python programming language aka Python 3000
|
||||||
Name: python3
|
Name: python3
|
||||||
Version: %{pybasever}.1
|
Version: %{pybasever}.1
|
||||||
Release: 13%{?dist}
|
Release: 12%{?dist}
|
||||||
License: Python
|
License: Python
|
||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
|
|
||||||
@ -243,9 +243,6 @@ Source7: pyfuntop.stp
|
|||||||
# Written by bkabrda
|
# Written by bkabrda
|
||||||
Source8: check-pyc-and-pyo-timestamps.py
|
Source8: check-pyc-and-pyo-timestamps.py
|
||||||
|
|
||||||
# Python wrapper arounf pythonXXm-config to be able to keep python3-devel multiarch
|
|
||||||
Source9: config.py
|
|
||||||
|
|
||||||
# Fixup distutils/unixccompiler.py to remove standard library path from rpath:
|
# Fixup distutils/unixccompiler.py to remove standard library path from rpath:
|
||||||
# Was Patch0 in ivazquez' python3000 specfile:
|
# Was Patch0 in ivazquez' python3000 specfile:
|
||||||
Patch1: Python-3.1.1-rpath.patch
|
Patch1: Python-3.1.1-rpath.patch
|
||||||
@ -1384,8 +1381,11 @@ sed \
|
|||||||
|
|
||||||
# Rename the script that differs on different arches to arch specific name
|
# Rename the script that differs on different arches to arch specific name
|
||||||
mv %{buildroot}%{_bindir}/python%{LDVERSION_optimized}-{,`uname -m`-}config
|
mv %{buildroot}%{_bindir}/python%{LDVERSION_optimized}-{,`uname -m`-}config
|
||||||
cp %{SOURCE9} %{buildroot}%{_bindir}/python%{LDVERSION_optimized}-config
|
echo -e '#!/bin/sh\nexec `dirname $0`/python%{LDVERSION_optimized}-`uname -m`-config "$@"' > \
|
||||||
chmod +x %{buildroot}%{_bindir}/python%{LDVERSION_optimized}-config
|
%{buildroot}%{_bindir}/python%{LDVERSION_optimized}-config
|
||||||
|
echo '[ $? -eq 127 ] && echo "Could not find python%{LDVERSION_optimized}-`uname -m`-config. Look around to see available arches." >&2' >> \
|
||||||
|
%{buildroot}%{_bindir}/python%{LDVERSION_optimized}-config
|
||||||
|
chmod +x %{buildroot}%{_bindir}/python%{LDVERSION_optimized}-config
|
||||||
|
|
||||||
# ======================================================
|
# ======================================================
|
||||||
# Running the upstream test suite
|
# Running the upstream test suite
|
||||||
@ -1853,9 +1853,6 @@ rm -fr %{buildroot}
|
|||||||
# ======================================================
|
# ======================================================
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Mon Jun 30 2014 Miro Hrončok <mhroncok@redhat.com> - 3.4.1-13
|
|
||||||
- Rewrite the config wrapper from Bash to Python, so it can be interpreted with Python
|
|
||||||
|
|
||||||
* Sun Jun 8 2014 Peter Robinson <pbrobinson@fedoraproject.org> 3.4.1-12
|
* Sun Jun 8 2014 Peter Robinson <pbrobinson@fedoraproject.org> 3.4.1-12
|
||||||
- aarch64 has valgrind, just list those that don't support it
|
- aarch64 has valgrind, just list those that don't support it
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user