diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-29 10:32:39 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-29 10:32:39 +0100 |
| commit | 5e905de49e0b3e1009bab32c62114043a14f286e (patch) | |
| tree | 1f0c4197e3790c4221cb6857e04dd23d596d2d8b /package/python3/patches | |
| parent | 21795cc1a20760ff37bca88b799fef664e70ccf2 (diff) | |
| parent | 1e8a2130a5b5ce6697956379e17bdeee435286ae (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/python3/patches')
| -rw-r--r-- | package/python3/patches/patch-Makefile_pre_in | 31 | ||||
| -rw-r--r-- | package/python3/patches/patch-Modules__io__iomodule_h | 14 |
2 files changed, 30 insertions, 15 deletions
diff --git a/package/python3/patches/patch-Makefile_pre_in b/package/python3/patches/patch-Makefile_pre_in index 894666d10..5a4077eba 100644 --- a/package/python3/patches/patch-Makefile_pre_in +++ b/package/python3/patches/patch-Makefile_pre_in @@ -1,5 +1,5 @@ --- Python-3.3.2.orig/Makefile.pre.in 2013-05-15 18:32:57.000000000 +0200 -+++ Python-3.3.2/Makefile.pre.in 2013-10-26 09:45:42.000000000 +0200 ++++ Python-3.3.2/Makefile.pre.in 2013-10-29 07:56:46.000000000 +0100 @@ -70,9 +70,9 @@ MAKESETUP= $(srcdir)/Modules/makese OPT= @OPT@ BASECFLAGS= @BASECFLAGS@ @@ -39,3 +39,32 @@ $(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS) $(MAKE) $(GRAMMAR_H) touch $(GRAMMAR_C) +@@ -1112,28 +1113,6 @@ libinstall: build_all $(srcdir)/Lib/$(PL + $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ + $(DESTDIR)$(LIBDEST)/distutils/tests ; \ + fi +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ +- -d $(LIBDEST) -f \ +- -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ +- $(DESTDIR)$(LIBDEST) +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \ +- -d $(LIBDEST) -f \ +- -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ +- $(DESTDIR)$(LIBDEST) +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ +- -d $(LIBDEST)/site-packages -f \ +- -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \ +- -d $(LIBDEST)/site-packages -f \ +- -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt + + # Create the PLATDIR source directory, if one wasn't distributed.. + $(srcdir)/Lib/$(PLATDIR): diff --git a/package/python3/patches/patch-Modules__io__iomodule_h b/package/python3/patches/patch-Modules__io__iomodule_h deleted file mode 100644 index 64ac4ffaf..000000000 --- a/package/python3/patches/patch-Modules__io__iomodule_h +++ /dev/null @@ -1,14 +0,0 @@ ---- Python-3.1.1.orig/Modules/_io/_iomodule.h 2009-06-12 04:07:12.000000000 +0200 -+++ Python-3.1.1/Modules/_io/_iomodule.h 2009-09-16 22:02:30.000000000 +0200 -@@ -99,7 +99,10 @@ typedef off_t Py_off_t; - # define PY_OFF_T_MAX LONG_MAX - # define PY_OFF_T_MIN LONG_MIN - #else --# error off_t does not match either size_t, long, or long long! -+# define PyLong_AsOff_t PyLong_AsSsize_t -+# define PyLong_FromOff_t PyLong_FromSsize_t -+# define PY_OFF_T_MAX PY_SSIZE_T_MAX -+# define PY_OFF_T_MIN PY_SSIZE_T_MIN - #endif - - #endif |