pool/python
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- update LD_LIBRARY_PATH to use $PWD instead of "." because the test

Browse Source 
process escapes to its own directory
- modify shebang-fixing scriptlet to ignore makeopcodetargets.py

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=194
This commit is contained in:
Jan Matejek 2016-06-30 13:10:14 +00:00 committed by Git OBS Bridge
parent 05220bdba0
commit 95238b7fc9
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python-base.changes
View File

@ -10,6 +10,9 @@ Thu Jun 30 09:23:05 UTC 2016 - jmatejek@suse.com
- refreshed multilib patch - refreshed multilib patch
- python-2.7.12-makeopcode.patch - run newly-built python interpreter - python-2.7.12-makeopcode.patch - run newly-built python interpreter
to make opcodes, in order not to require pre-built python to make opcodes, in order not to require pre-built python
- update LD_LIBRARY_PATH to use $PWD instead of "." because the test
process escapes to its own directory
- modify shebang-fixing scriptlet to ignore makeopcodetargets.py
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 29 13:03:40 UTC 2016 - rguenther@suse.com Fri Jan 29 13:03:40 UTC 2016 - rguenther@suse.com

2
python-doc.spec
View File

@ -56,6 +56,7 @@ Patch34: python-2.7.9-sles-disable-verification-by-default.patch
# PATCH-FIX-UPSTREAM python-ncurses-6.0-accessors.patch dimstar@opensuse.org -- Fix build with NCurses 6.0 and OPAQUE_WINDOW set to 1 # PATCH-FIX-UPSTREAM python-ncurses-6.0-accessors.patch dimstar@opensuse.org -- Fix build with NCurses 6.0 and OPAQUE_WINDOW set to 1
Patch35: python-ncurses-6.0-accessors.patch Patch35: python-ncurses-6.0-accessors.patch
Patch36: python-2.7.10-overflow_check.patch Patch36: python-2.7.10-overflow_check.patch
Patch37: python-2.7.12-makeopcode.patch
# COMMON-PATCH-END # COMMON-PATCH-END
Provides: pyth_doc Provides: pyth_doc
Provides: pyth_ps Provides: pyth_ps
@ -103,6 +104,7 @@ Python, and Macintosh Module Reference in PDF format.
%endif %endif
%patch35 -p1 %patch35 -p1
%patch36 %patch36
%patch37 -p1
# drop Autoconf version requirement # drop Autoconf version requirement
sed -i 's/^version_required/dnl version_required/' configure.ac sed -i 's/^version_required/dnl version_required/' configure.ac

7
python.spec
View File

@ -61,6 +61,7 @@ Patch34: python-2.7.9-sles-disable-verification-by-default.patch
# PATCH-FIX-UPSTREAM python-ncurses-6.0-accessors.patch dimstar@opensuse.org -- Fix build with NCurses 6.0 and OPAQUE_WINDOW set to 1 # PATCH-FIX-UPSTREAM python-ncurses-6.0-accessors.patch dimstar@opensuse.org -- Fix build with NCurses 6.0 and OPAQUE_WINDOW set to 1
Patch35: python-ncurses-6.0-accessors.patch Patch35: python-ncurses-6.0-accessors.patch
Patch36: python-2.7.10-overflow_check.patch Patch36: python-2.7.10-overflow_check.patch
Patch37: python-2.7.12-makeopcode.patch
# COMMON-PATCH-END # COMMON-PATCH-END
BuildRequires: automake BuildRequires: automake
BuildRequires: db-devel BuildRequires: db-devel
@ -204,6 +205,7 @@ that rely on earlier non-verification behavior.
%endif %endif
%patch35 -p1 %patch35 -p1
%patch36 %patch36
%patch37 -p1
# drop Autoconf version requirement # drop Autoconf version requirement
sed -i 's/^version_required/dnl version_required/' configure.ac sed -i 's/^version_required/dnl version_required/' configure.ac
@ -231,6 +233,7 @@ touch Parser/asdl* Python/Python-ast.c Include/Python-ast.h
--enable-shared \ --enable-shared \
--enable-unicode=ucs4 --enable-unicode=ucs4
LD_LIBRARY_PATH=$PWD:$LD_LIBRARY_PATH \
make %{?_smp_mflags} make %{?_smp_mflags}
%check %check
@ -248,7 +251,9 @@ make test TESTOPTS="$LIST" TESTPYTHONOPTS="-R"
%install %install
# replace rest of /usr/local/bin/python or /usr/bin/python2.x with /usr/bin/python # replace rest of /usr/local/bin/python or /usr/bin/python2.x with /usr/bin/python
find . -wholename "./Parser" -prune -o -name '*.py' -type f -print0 | xargs -0 grep -lE '^#! *(/usr/.*bin/(env +)?)?python' | xargs sed -r -i -e '1s@^#![[:space:]]*(/usr/(local/)?bin/(env +)?)?python([0-9]+\.[0-9]+)?@#!/usr/bin/python@' find . -name '*.py' -type f | grep -vE "^./Parser/|^./Python/" \
| xargs grep -lE '^#! *(/usr/.*bin/(env +)?)?python' \
| xargs sed -r -i -e '1s@^#![[:space:]]*(/usr/(local/)?bin/(env +)?)?python([0-9]+\.[0-9]+)?@#!/usr/bin/python@'
# the grep inbetween makes it much faster # the grep inbetween makes it much faster
######################################## ########################################
# install it # install it