diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-09-15 15:30:51 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-09-21 10:19:21 +0200 |
commit | 4c7f558c8e1ba4aafc2aa3741017c45484c62904 (patch) | |
tree | c5c1d44625cc075b14e6515b5f0c171c545b3b91 /patches/Python-3.5.0 | |
parent | 228ca4bc6df2024c62b79e55db19d3ad6487cc26 (diff) | |
download | ptxdist-4c7f558c8e1ba4aafc2aa3741017c45484c62904.tar.gz ptxdist-4c7f558c8e1ba4aafc2aa3741017c45484c62904.tar.xz |
python3: version bump 3.4.2 -> 3.5.0
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/Python-3.5.0')
-rw-r--r-- | patches/Python-3.5.0/0001-python3-don-t-leak-host-path-into-cross-compilation.patch | 35 | ||||
-rw-r--r-- | patches/Python-3.5.0/0002-use-shipped-sources.patch | 40 | ||||
-rw-r--r-- | patches/Python-3.5.0/series | 5 |
3 files changed, 80 insertions, 0 deletions
diff --git a/patches/Python-3.5.0/0001-python3-don-t-leak-host-path-into-cross-compilation.patch b/patches/Python-3.5.0/0001-python3-don-t-leak-host-path-into-cross-compilation.patch new file mode 100644 index 000000000..d157adc67 --- /dev/null +++ b/patches/Python-3.5.0/0001-python3-don-t-leak-host-path-into-cross-compilation.patch @@ -0,0 +1,35 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Tue, 15 Sep 2015 15:33:58 +0200 +Subject: [PATCH] python3: don't leak host path into cross compilation + +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(-) + +diff --git a/setup.py b/setup.py +index da67731aa19f..1c3f2d09f794 100644 +--- a/setup.py ++++ b/setup.py +@@ -511,7 +511,8 @@ class PyBuildExt(build_ext): + add_dir_to_list(dir_list, directory) + + if os.path.normpath(sys.base_prefix) != '/usr' \ +- and not sysconfig.get_config_var('PYTHONFRAMEWORK'): ++ and not sysconfig.get_config_var('PYTHONFRAMEWORK') \ ++ and not cross_compiling: + # 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): + panel_library = 'panel' + if curses_library == 'ncursesw': + curses_defines.append(('HAVE_NCURSESW', '1')) +- curses_includes.append('/usr/include/ncursesw') ++ if not cross_compiling: ++ curses_includes.append('/usr/include/ncursesw') + # Bug 1464056: If _curses.so links with ncursesw, + # _curses_panel.so must link with panelw. + panel_library = 'panelw' diff --git a/patches/Python-3.5.0/0002-use-shipped-sources.patch b/patches/Python-3.5.0/0002-use-shipped-sources.patch new file mode 100644 index 000000000..710f79f6c --- /dev/null +++ b/patches/Python-3.5.0/0002-use-shipped-sources.patch @@ -0,0 +1,40 @@ +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/series b/patches/Python-3.5.0/series new file mode 100644 index 000000000..84288eec6 --- /dev/null +++ b/patches/Python-3.5.0/series @@ -0,0 +1,5 @@ +# 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 |