From a596e3e23fd60995a89318bd3518797a94bfa1d8 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 12 Jul 2008 14:07:07 +0000 Subject: python-native 2.5.1 add distutils patch to catch up with newer SWIG versions This fixes the infamous: TypeError: swig_sources() takes exactly 2 arguments (3 given) --- .../python-native-2.5.1/catchup-with-swig.patch | 13 +++++++++++++ packages/python/python-native_2.5.1.bb | 20 +++++++++----------- 2 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 packages/python/python-native-2.5.1/catchup-with-swig.patch (limited to 'packages/python') diff --git a/packages/python/python-native-2.5.1/catchup-with-swig.patch b/packages/python/python-native-2.5.1/catchup-with-swig.patch new file mode 100644 index 0000000000..f049b759f4 --- /dev/null +++ b/packages/python/python-native-2.5.1/catchup-with-swig.patch @@ -0,0 +1,13 @@ +Index: Python-2.5.1/Lib/distutils/command/build_ext.py +=================================================================== +--- Python-2.5.1.orig/Lib/distutils/command/build_ext.py ++++ Python-2.5.1/Lib/distutils/command/build_ext.py +@@ -513,7 +513,7 @@ class build_ext (Command): + target_lang=language) + + +- def swig_sources (self, sources, extension): ++ def swig_sources (self, sources, extension=None): + + """Walk the list of source files in 'sources', looking for SWIG + interface (.i) files. Run SWIG on all that are found, and diff --git a/packages/python/python-native_2.5.1.bb b/packages/python/python-native_2.5.1.bb index ea6e257043..3f58d36a2e 100644 --- a/packages/python/python-native_2.5.1.bb +++ b/packages/python/python-native_2.5.1.bb @@ -4,15 +4,18 @@ LICENSE = "PSF" SECTION = "devel/python" PRIORITY = "optional" DEPENDS = "" -PR = "ml1" +PR = "ml2" EXCLUDE_FROM_WORLD = "1" -SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ - file://bindir-libdir.patch;patch=1 \ - file://cross-distutils.patch;patch=1 \ - file://dont-modify-shebang-line.patch;patch=1 \ - file://default-is-optimized.patch;patch=1" +SRC_URI = "\ + http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ + file://bindir-libdir.patch;patch=1 \ + file://cross-distutils.patch;patch=1 \ + file://dont-modify-shebang-line.patch;patch=1 \ + file://default-is-optimized.patch;patch=1 \ + file://catchup-with-swig.patch;patch=1 \ +" S = "${WORKDIR}/Python-${PV}" inherit autotools native @@ -24,11 +27,6 @@ EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \ --without-cxx --with-signal-module --with-wctype-functions" EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""' -#do_configure() { -# # the autofoo stuff is too old to allow regenerating -# oe_runconf -#} - do_stage_append() { install -m 0755 Parser/pgen ${STAGING_BINDIR_NATIVE}/ } -- cgit v1.2.3 From a8a7aa9a1178682a6636948a59146e083f462f7b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 12 Jul 2008 14:08:20 +0000 Subject: python-setuptools[-native] 0.6c6 update to 0.6c8 --- packages/python/python-setuptools-native_0.6c6.bb | 9 --------- packages/python/python-setuptools-native_0.6c8.bb | 9 +++++++++ packages/python/python-setuptools_0.6c6.bb | 17 ----------------- packages/python/python-setuptools_0.6c8.bb | 17 +++++++++++++++++ 4 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 packages/python/python-setuptools-native_0.6c6.bb create mode 100644 packages/python/python-setuptools-native_0.6c8.bb delete mode 100644 packages/python/python-setuptools_0.6c6.bb create mode 100644 packages/python/python-setuptools_0.6c8.bb (limited to 'packages/python') diff --git a/packages/python/python-setuptools-native_0.6c6.bb b/packages/python/python-setuptools-native_0.6c6.bb deleted file mode 100644 index b7716d8cac..0000000000 --- a/packages/python/python-setuptools-native_0.6c6.bb +++ /dev/null @@ -1,9 +0,0 @@ -require python-setuptools_${PV}.bb -inherit native - -DEPENDS = "python-native" - -do_stage() { - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - ${STAGING_BINDIR_NATIVE}/python setup.py install -} diff --git a/packages/python/python-setuptools-native_0.6c8.bb b/packages/python/python-setuptools-native_0.6c8.bb new file mode 100644 index 0000000000..b7716d8cac --- /dev/null +++ b/packages/python/python-setuptools-native_0.6c8.bb @@ -0,0 +1,9 @@ +require python-setuptools_${PV}.bb +inherit native + +DEPENDS = "python-native" + +do_stage() { + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + ${STAGING_BINDIR_NATIVE}/python setup.py install +} diff --git a/packages/python/python-setuptools_0.6c6.bb b/packages/python/python-setuptools_0.6c6.bb deleted file mode 100644 index fe78e585f7..0000000000 --- a/packages/python/python-setuptools_0.6c6.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Download, build, install, upgrade, and uninstall Python packages" -HOMEPAGE = "http://cheeseshop.python.org/pypi/setuptools" -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "MIT-like" -RDEPENDS = "python-distutils python-compression" -SRCNAME = "setuptools" -PR = "ml2" - -SRC_URI = "http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit distutils - -do_install_prepend() { - install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages -} diff --git a/packages/python/python-setuptools_0.6c8.bb b/packages/python/python-setuptools_0.6c8.bb new file mode 100644 index 0000000000..19f73d3f67 --- /dev/null +++ b/packages/python/python-setuptools_0.6c8.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Download, build, install, upgrade, and uninstall Python packages" +HOMEPAGE = "http://cheeseshop.python.org/pypi/setuptools" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "MIT-like" +RDEPENDS = "python-distutils python-compression" +SRCNAME = "setuptools" +PR = "ml0" + +SRC_URI = "http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit distutils + +do_install_prepend() { + install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages +} -- cgit v1.2.3 From 1329a4624bfec8dc8dcf86c2a6e14125a32d9021 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 16 Jul 2008 07:40:40 +0000 Subject: python-evas cvs quickhack to make it work with newer pyrex --- packages/python/python-evas_cvs.bb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'packages/python') diff --git a/packages/python/python-evas_cvs.bb b/packages/python/python-evas_cvs.bb index 92f4466a24..57e28b28ed 100644 --- a/packages/python/python-evas_cvs.bb +++ b/packages/python/python-evas_cvs.bb @@ -3,6 +3,10 @@ DEPENDS += "evas" PV = "0.2.1+cvs${SRCDATE}" PR = "r0" +do_compile_prepend() { + touch include/evas/__init__.py +} + do_stage() { distutils_stage_all } -- cgit v1.2.3 From 74a560bfe000c60dedd513604cea372dbac6590a Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 16 Jul 2008 07:51:03 +0000 Subject: python 2.5.2 add parameter to run python in unoptimized bytecode mode Thanks to the default-is-optimized patch, this python was running in optimized mode all the time, there was no way to run it unoptimized. However this is necessary at times (e.g. if you want to run code that contains 'assert' statements, since optimized bytecode strips these out), so I added a new command line parameter 'N' to python that allows you to run it unoptimized. --- .../python/python-2.5.2/default-is-optimized.patch | 41 ++++++++++++++++++++-- packages/python/python_2.5.2.bb | 2 +- 2 files changed, 39 insertions(+), 4 deletions(-) (limited to 'packages/python') diff --git a/packages/python/python-2.5.2/default-is-optimized.patch b/packages/python/python-2.5.2/default-is-optimized.patch index 6beeb6e022..072bf0b059 100644 --- a/packages/python/python-2.5.2/default-is-optimized.patch +++ b/packages/python/python-2.5.2/default-is-optimized.patch @@ -1,7 +1,7 @@ -Index: Python-2.5.1/Python/compile.c +Index: Python-2.5.2/Python/compile.c =================================================================== ---- Python-2.5.1.orig/Python/compile.c -+++ Python-2.5.1/Python/compile.c +--- Python-2.5.2.orig/Python/compile.c ++++ Python-2.5.2/Python/compile.c @@ -30,7 +30,7 @@ #include "symtable.h" #include "opcode.h" @@ -11,3 +11,38 @@ Index: Python-2.5.1/Python/compile.c /* ISSUES: +Index: Python-2.5.2/Modules/main.c +=================================================================== +--- Python-2.5.2.orig/Modules/main.c ++++ Python-2.5.2/Modules/main.c +@@ -40,7 +40,7 @@ static char **orig_argv; + static int orig_argc; + + /* command line options */ +-#define BASE_OPTS "c:dEhim:OQ:StuUvVW:xX?" ++#define BASE_OPTS "c:dEhim:ONQ:StuUvVW:xX?" + + #ifndef RISCOS + #define PROGRAM_OPTS BASE_OPTS +@@ -68,8 +68,7 @@ Options and arguments (and corresponding + "; + static char *usage_2 = "\ + -m mod : run library module as a script (terminates option list)\n\ +--O : optimize generated bytecode (a tad; also PYTHONOPTIMIZE=x)\n\ +--OO : remove doc-strings in addition to the -O optimizations\n\ ++-N : do NOT optimize generated bytecode\n\ + -Q arg : division options: -Qold (default), -Qwarn, -Qwarnall, -Qnew\n\ + -S : don't imply 'import site' on initialization\n\ + -t : issue warnings about inconsistent tab usage (-tt: issue errors)\n\ +@@ -302,7 +301,10 @@ Py_Main(int argc, char **argv) + break; + + case 'O': +- Py_OptimizeFlag++; ++ fprintf(stderr, "-O is already default in this version. Ignoring\n"); ++ ++ case 'N': ++ Py_OptimizeFlag=0; + break; + + case 'S': diff --git a/packages/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb index 22aac7c9ee..9617871fff 100644 --- a/packages/python/python_2.5.2.bb +++ b/packages/python/python_2.5.2.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk" DEPENDS_sharprom = "python-native readline zlib gdbm openssl" # bump this on every change in contrib/python/generate-manifest-2.5.py -PR = "ml4" +PR = "ml6" PYTHON_MAJMIN = "2.5" -- cgit v1.2.3