summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <mail@waldemar-brodkorb.de>2013-10-29 08:11:38 +0100
committerWaldemar Brodkorb <mail@waldemar-brodkorb.de>2013-10-29 08:11:38 +0100
commit6c4a3cbc980b8c99b6064073bcb54bdbe73bcd0a (patch)
tree008825b92e87ee94a18540f0b029e13df809a9a4
parent303f5c0994a6ff6c7d3bee7c29f94928ae5674de (diff)
avoid byte compiling on install, so bytecode must not be removed afterwards
-rw-r--r--package/python3/Makefile3
-rw-r--r--package/python3/patches/patch-Makefile_pre_in31
-rw-r--r--package/python3/patches/patch-Modules__io__iomodule_h14
3 files changed, 31 insertions, 17 deletions
diff --git a/package/python3/Makefile b/package/python3/Makefile
index 3ce608171..122e14bff 100644
--- a/package/python3/Makefile
+++ b/package/python3/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= python3
PKG_VERSION:= 3.3.2
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 0a2ea57f6184baf45b150aee53c0c8da
PKG_DESCR:= Python scripting language (Version 3)
PKG_SECTION:= lang
@@ -116,7 +116,6 @@ python3-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
${CP} ${WRKINST}/usr/lib/python3.3/* ${IDIR_PYTHON3}/usr/lib/python3.3
${CP} ${WRKINST}/usr/include/python3.3m/pyconfig.h \
${IDIR_PYTHON3}/usr/include/python3.3m
- find ${IDIR_PYTHON3} -name "\*.pyc" -o -name "*\.pyo" -exec rm {} \;
for i in zlib _bz2 _ncurses _ssl _gdbm _sqlite pyexpat readline; do \
rm ${IDIR_PYTHON3}/usr/lib/python3.3/lib-dynload/$${i}*so; \
done
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