Skip to content

Commit

Permalink
Merge pull request xbmc#9978 from wsnipex/bump-python
Browse files Browse the repository at this point in the history
[depends] bump python to 2.7.11
  • Loading branch information
MartijnKaijser authored Jun 14, 2016
2 parents db1ad54 + 9f2c5ac commit ff05e0f
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 26 deletions.
3 changes: 1 addition & 2 deletions tools/depends/target/python27/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ DEPS= ../../Makefile.include Makefile Python-2.7.10-crosscompile.patch Python-2.

# lib name, version
LIBNAME=Python
VERSION=2.7.10
VERSION=2.7.11
SOURCE=$(LIBNAME)-$(VERSION)
ARCHIVE=$(SOURCE).tar.xz

Expand Down Expand Up @@ -39,7 +39,6 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
cd $(PLATFORM); patch -p0 < ../Python-2.7.10-android.patch
cd $(PLATFORM); patch -p0 < ../Python-no-export-path.patch
cd $(PLATFORM); patch -p0 < ../fix-ffi.patch
#cd $(PLATFORM); patch -p1 < ../urllib-ssl-no-cert_check.patch
ifeq ($(OS),ios)
cd $(PLATFORM); patch -p0 < ../make-fork-optional.patch
cd $(PLATFORM); patch -p0 < ../Python-2.6.5-urllib.diff
Expand Down
10 changes: 5 additions & 5 deletions tools/depends/target/python27/Python-2.7.10-crosscompile.patch
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
--- Makefile.pre.in.orig 2015-05-23 18:09:16.000000000 +0200
+++ Makefile.pre.in 2015-10-10 12:29:21.988926069 +0200
@@ -234,6 +234,7 @@
@@ -238,6 +238,7 @@
##########################################################################
# Parser
PGEN= Parser/pgen$(EXE)
+PGEN_FOR_BUILD=$(NATIVE_PGEN)

PSRCS= \
Parser/acceler.c \
@@ -472,9 +473,9 @@
@@ -497,9 +498,9 @@
*\ -s*|s*) quiet="-q";; \
*) quiet="";; \
esac; \
Expand All @@ -20,7 +20,7 @@

# Build static library
# avoid long command lines, same as LIBRARY_OBJS
@@ -611,7 +612,7 @@
@@ -636,7 +637,7 @@
$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS)
@$(MKDIR_P) Include
$(MAKE) $(PGEN)
Expand All @@ -29,7 +29,7 @@
$(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS)
$(MAKE) $(GRAMMAR_H)
touch $(GRAMMAR_C)
@@ -1042,12 +1043,12 @@
@@ -1072,12 +1073,12 @@
$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
$(DESTDIR)$(LIBDEST)/distutils/tests ; \
fi
Expand All @@ -44,7 +44,7 @@
$(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
-d $(LIBDEST) -f \
-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
@@ -1175,11 +1176,13 @@
@@ -1205,11 +1206,13 @@
# Install the dynamically loadable modules
# This goes into $(exec_prefix)
sharedinstall: sharedmods
Expand Down
2 changes: 1 addition & 1 deletion tools/depends/target/python27/Python-no-export-path.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- Makefile.pre.in.orig 2015-10-09 19:10:15.042905069 +0200
+++ Makefile.pre.in 2015-10-09 19:11:01.513642241 +0200
@@ -1070,8 +1070,6 @@
@@ -1100,8 +1100,6 @@
$(srcdir)/Lib/$(PLATDIR):
mkdir $(srcdir)/Lib/$(PLATDIR)
cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen
Expand Down
4 changes: 2 additions & 2 deletions tools/depends/target/python27/Python-setup.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- setup.py.orig 2015-10-07 16:32:16.219083585 +0200
+++ setup.py 2015-10-07 16:41:48.563085871 +0200
@@ -320,6 +320,9 @@
@@ -321,6 +321,9 @@
self.announce('WARNING: skipping import check for Cygwin-based "%s"'
% ext.name)
return
Expand All @@ -10,7 +10,7 @@
ext_filename = os.path.join(
self.build_lib,
self.get_ext_filename(self.get_ext_fullname(ext.name)))
@@ -331,27 +334,30 @@
@@ -335,27 +338,30 @@
try:
imp.load_dynamic(ext.name, ext_filename)
except ImportError, why:
Expand Down
4 changes: 2 additions & 2 deletions tools/depends/target/python27/fix-ffi.patch
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
+*/
--- Modules/_ctypes/cfield.c.orig 2015-10-11 20:34:03.034370393 +0200
+++ Modules/_ctypes/cfield.c 2015-10-11 20:37:04.462377159 +0200
@@ -1723,6 +1723,7 @@
@@ -1724,6 +1724,7 @@
*/

/* align and size are bogus for void, but they must not be zero */
+/*
ffi_type ffi_type_void = { 1, 1, FFI_TYPE_VOID };

ffi_type ffi_type_uint8 = { 1, 1, FFI_TYPE_UINT8 };
@@ -1739,14 +1740,14 @@
@@ -1740,14 +1741,14 @@

ffi_type ffi_type_float = { sizeof(float), FLOAT_ALIGN, FFI_TYPE_FLOAT };
ffi_type ffi_type_double = { sizeof(double), DOUBLE_ALIGN, FFI_TYPE_DOUBLE };
Expand Down
14 changes: 0 additions & 14 deletions tools/depends/target/python27/urllib-ssl-no-cert_check.patch

This file was deleted.

0 comments on commit ff05e0f

Please sign in to comment.