python3: version bump 3.5.0 -> 3.5.3

Cleanup configure options while at it.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

3 files changed, 14 insertions, 47 deletions

diff --git a/patches/Python-3.5.0/0002-use-shipped-sources.patch b/patches/Python-3.5.0/0002-use-shipped-sources.patch
deleted file mode 100644
index 710f79f6c..000000000
--- a/patches/Python-3.5.0/0002-use-shipped-sources.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Tue, 15 Sep 2015 12:27:00 +0200
-Subject: [PATCH] use shipped sources
-
-Only depend on generator tools existence. This way shipped sources are used
-and no extra host tools are needed. This is especially useful when
-cross-compiling because the tools are built for the target architecture.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- Makefile.pre.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index ce2c0aa29006..4779227a7845 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -696,11 +696,11 @@ Programs/_freeze_importlib.o: Programs/_freeze_importlib.c Makefile
- Programs/_freeze_importlib: Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN)
- 	$(LINKCC) $(PY_LDFLAGS) -o $@ Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
- 
--Python/importlib_external.h: $(srcdir)/Lib/importlib/_bootstrap_external.py Programs/_freeze_importlib
-+Python/importlib_external.h: $(srcdir)/Lib/importlib/_bootstrap_external.py | Programs/_freeze_importlib
- 	./Programs/_freeze_importlib \
- 		$(srcdir)/Lib/importlib/_bootstrap_external.py Python/importlib_external.h
- 
--Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib
-+Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py | Programs/_freeze_importlib
- 	./Programs/_freeze_importlib \
- 		$(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h
- 
-@@ -762,7 +762,7 @@ Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile
- 
- $(IO_OBJS): $(IO_H)
- 
--$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN)
-+$(GRAMMAR_H): $(GRAMMAR_INPUT) | $(PGEN)
- 		@$(MKDIR_P) Include
- 		$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
- $(GRAMMAR_C): $(GRAMMAR_H)
diff --git a/patches/Python-3.5.0/0001-python3-don-t-leak-host-path-into-cross-compilation.patch b/patches/Python-3.5.3/0001-python3-don-t-leak-host-path-into-cross-compilation.patch
index d157adc67..fbe2c312f 100644
--- a/patches/Python-3.5.0/0001-python3-don-t-leak-host-path-into-cross-compilation.patch
+++ b/patches/Python-3.5.3/0001-python3-don-t-leak-host-path-into-cross-compilation.patch
@@ -6,14 +6,14 @@ Based on a patch by Han Sirkstra <han@protonic.nl>
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- setup.py | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
+ setup.py | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index da67731aa19f..1c3f2d09f794 100644
+index 40f8bf20ee74..ee04dba88fa8 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -511,7 +511,8 @@ class PyBuildExt(build_ext):
+@@ -533,7 +533,8 @@ class PyBuildExt(build_ext):
                          add_dir_to_list(dir_list, directory)
  
          if os.path.normpath(sys.base_prefix) != '/usr' \
@@ -23,7 +23,15 @@ index da67731aa19f..1c3f2d09f794 100644
              # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
              # (PYTHONFRAMEWORK is set) to avoid # linking problems when
              # building a framework with different architectures than
-@@ -1294,7 +1295,8 @@ class PyBuildExt(build_ext):
+@@ -1274,7 +1275,6 @@ class PyBuildExt(build_ext):
+                         if dbm_setup_debug: print("building dbm using bdb")
+                         dbmext = Extension('_dbm', ['_dbmmodule.c'],
+                                            library_dirs=dblib_dir,
+-                                           runtime_library_dirs=dblib_dir,
+                                            include_dirs=db_incs,
+                                            define_macros=[
+                                                ('HAVE_BERKDB_H', None),
+@@ -1323,7 +1323,8 @@ class PyBuildExt(build_ext):
          panel_library = 'panel'
          if curses_library == 'ncursesw':
              curses_defines.append(('HAVE_NCURSESW', '1'))
diff --git a/patches/Python-3.5.0/series b/patches/Python-3.5.3/series
index 84288eec6..7f3b3d069 100644
--- a/patches/Python-3.5.0/series
+++ b/patches/Python-3.5.3/series
@@ -1,5 +1,4 @@
 # generated by git-ptx-patches
 #tag:base --start-number 1
 0001-python3-don-t-leak-host-path-into-cross-compilation.patch
-0002-use-shipped-sources.patch
-# e50e954c62b1c19860534e34350c9138  - git-ptx-patches magic
+# 3a85778f36c3116f07c55efca7ccb1a7  - git-ptx-patches magic