From 443f6022df06d9f9dc221011c1744274deff2c2c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Aug 2008 16:12:35 +0000 Subject: python-numpy: fix wrong include paths, but it still tries to run generated code during configure * it wraps scons with distutils. crazy python dudes --- packages/python/python-numpy/.mtn2git_empty | 0 packages/python/python-numpy/unbreak-assumptions.diff | 16 ++++++++++++++++ packages/python/python-numpy_1.1.1.bb | 4 +++- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 packages/python/python-numpy/.mtn2git_empty create mode 100644 packages/python/python-numpy/unbreak-assumptions.diff (limited to 'packages/python') diff --git a/packages/python/python-numpy/.mtn2git_empty b/packages/python/python-numpy/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/python/python-numpy/unbreak-assumptions.diff b/packages/python/python-numpy/unbreak-assumptions.diff new file mode 100644 index 0000000000..c5b448167f --- /dev/null +++ b/packages/python/python-numpy/unbreak-assumptions.diff @@ -0,0 +1,16 @@ +--- /tmp/system_info.py 2008-08-22 00:38:16.000000000 +0200 ++++ numpy-1.1.1/numpy/distutils/system_info.py 2008-08-22 00:40:33.013198000 +0200 +@@ -137,11 +137,8 @@ + default_x11_lib_dirs = [] + default_x11_include_dirs = [] + else: +- default_lib_dirs = ['/usr/local/lib', '/opt/lib', '/usr/lib', +- '/opt/local/lib', '/sw/lib'] +- default_include_dirs = ['/usr/local/include', +- '/opt/include', '/usr/include', +- '/opt/local/include', '/sw/include'] ++ default_lib_dirs = ['/non-existant-dir'] ++ default_include_dirs = ['non-existant-dir'] + default_src_dirs = ['.','/usr/local/src', '/opt/src','/sw/src'] + + try: diff --git a/packages/python/python-numpy_1.1.1.bb b/packages/python/python-numpy_1.1.1.bb index d688c93beb..e23c89e3cf 100644 --- a/packages/python/python-numpy_1.1.1.bb +++ b/packages/python/python-numpy_1.1.1.bb @@ -5,7 +5,9 @@ LICENSE = "PSF" PR = "ml0" SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${PV}.tar.gz \ - " + file://unbreak-assumptions.diff;patch=1 \ + " + S = "${WORKDIR}/numpy-${PV}" inherit distutils -- cgit v1.2.3 From 19a4b765a694c070bc50477026cda03143af34df Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 1 Sep 2008 10:16:05 +0000 Subject: python-numpy: add gross hack to make it build --- packages/python/python-numpy/arm/.mtn2git_empty | 0 packages/python/python-numpy/arm/config.h | 21 ++++++++++++++++ packages/python/python-numpy/arm/numpyconfig.h | 17 +++++++++++++ packages/python/python-numpy/trycompile.diff | 33 +++++++++++++++++++++++++ packages/python/python-numpy_1.1.1.bb | 15 ++++++++--- 5 files changed, 83 insertions(+), 3 deletions(-) create mode 100644 packages/python/python-numpy/arm/.mtn2git_empty create mode 100644 packages/python/python-numpy/arm/config.h create mode 100644 packages/python/python-numpy/arm/numpyconfig.h create mode 100644 packages/python/python-numpy/trycompile.diff (limited to 'packages/python') diff --git a/packages/python/python-numpy/arm/.mtn2git_empty b/packages/python/python-numpy/arm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/python/python-numpy/arm/config.h b/packages/python/python-numpy/arm/config.h new file mode 100644 index 0000000000..17ef186d56 --- /dev/null +++ b/packages/python/python-numpy/arm/config.h @@ -0,0 +1,21 @@ +/* ./src.linux-i686-2.5/numpy/core/include/numpy/config.h */ +/* #define SIZEOF_SHORT 2 */ +/* #define SIZEOF_INT 4 */ +/* #define SIZEOF_LONG 4 */ +/* #define SIZEOF_FLOAT 4 */ +/* #define SIZEOF_DOUBLE 8 */ +#define SIZEOF_LONG_DOUBLE 12 +#define SIZEOF_PY_INTPTR_T 4 +/* #define SIZEOF_LONG_LONG 8 */ +#define SIZEOF_PY_LONG_LONG 8 +/* #define CHAR_BIT 8 */ +#define MATHLIB m +#define HAVE_FLOAT_FUNCS +#define HAVE_LOG1P +#define HAVE_EXPM1 +#define HAVE_INVERSE_HYPERBOLIC +#define HAVE_INVERSE_HYPERBOLIC_FLOAT +#define HAVE_ISNAN +#define HAVE_ISINF +#define HAVE_RINT + diff --git a/packages/python/python-numpy/arm/numpyconfig.h b/packages/python/python-numpy/arm/numpyconfig.h new file mode 100644 index 0000000000..c4bf6547f0 --- /dev/null +++ b/packages/python/python-numpy/arm/numpyconfig.h @@ -0,0 +1,17 @@ +/* cat ./src.linux-i686-2.5/numpy/core/include/numpy/numpyconfig.h */ +/* + * * This file is generated by numpy/core/setup.pyc. DO NOT EDIT + * */ +#define NPY_SIZEOF_SHORT 2 +#define NPY_SIZEOF_INT 4 +#define NPY_SIZEOF_LONG 4 +#define NPY_SIZEOF_FLOAT 4 +#define NPY_SIZEOF_DOUBLE 8 +#define NPY_SIZEOF_LONGDOUBLE 12 +#define NPY_SIZEOF_PY_INTPTR_T 4 +#define NPY_NO_SMP 0 + +#define NPY_SIZEOF_LONGLONG 8 +#define NPY_SIZEOF_PY_LONG_LONG 8 +/* #define CHAR_BIT 8 */ + diff --git a/packages/python/python-numpy/trycompile.diff b/packages/python/python-numpy/trycompile.diff new file mode 100644 index 0000000000..3ab3d72f2c --- /dev/null +++ b/packages/python/python-numpy/trycompile.diff @@ -0,0 +1,33 @@ +--- /tmp/setup.py 2008-09-01 10:37:44.000000000 +0200 ++++ numpy-1.1.1/numpy/core/setup.py 2008-09-01 10:38:20.373198000 +0200 +@@ -80,8 +80,7 @@ + raise SystemError,\ + "Non-existing %s. Perhaps you need to install"\ + " python-dev|python-devel." % (python_h) +- result = config_cmd.try_run(tc,include_dirs=[python_include], +- library_dirs = default_lib_dirs) ++ result = config_cmd.try_compile(tc) + if not result: + raise SystemError,"Failed to test configuration. "\ + "See previous error messages for more information." +@@ -95,7 +94,7 @@ + if mathlib: + mathlibs_choices.insert(0,mathlib.split(',')) + for libs in mathlibs_choices: +- if config_cmd.try_run(tc,libraries=libs): ++ if config_cmd.try_compile(tc): + mathlibs = libs + break + else: +@@ -180,10 +179,7 @@ + " python-dev|python-devel." % (python_h) + + config.numpy_include_dirs +- result = config_cmd.try_run(testcode, +- include_dirs = [python_include] + \ +- config.numpy_include_dirs, +- library_dirs = default_lib_dirs) ++ result = config_cmd.try_compile(testcode) + + if not result: + raise SystemError,"Failed to generate numpy configuration. "\ diff --git a/packages/python/python-numpy_1.1.1.bb b/packages/python/python-numpy_1.1.1.bb index e23c89e3cf..157dadadaf 100644 --- a/packages/python/python-numpy_1.1.1.bb +++ b/packages/python/python-numpy_1.1.1.bb @@ -6,13 +6,22 @@ PR = "ml0" SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${PV}.tar.gz \ file://unbreak-assumptions.diff;patch=1 \ - " + file://trycompile.diff;patch=1 \ + file://config.h \ + file://numpyconfig.h \ + " S = "${WORKDIR}/numpy-${PV}" inherit distutils -do_stage() { - cp -pPR Include/Num* ${STAGING_INCDIR} +# Make the build fail and replace *config.h with proper one +# This is a ugly, ugly hack - Koen +do_compile_prepend() { + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + ${STAGING_BINDIR_NATIVE}/python setup.py build ${DISTUTILS_BUILD_ARGS} || \ + true + cp ${WORKDIR}/*config.h ${S}/build/$(ls ${S}/build | grep src)/numpy/core/include/numpy/ } + -- cgit v1.2.3 From 0f5cb2adb11a4e26a87888c6c7be433d7470f3f2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 1 Sep 2008 13:54:51 +0000 Subject: python-xappy: add 0.5 --- packages/python/python-xappy_0.5.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 packages/python/python-xappy_0.5.bb (limited to 'packages/python') diff --git a/packages/python/python-xappy_0.5.bb b/packages/python/python-xappy_0.5.bb new file mode 100644 index 0000000000..d257905896 --- /dev/null +++ b/packages/python/python-xappy_0.5.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "The xappy python module is an easy-to-use interface to the Xapian search engine" +LICENSE = "GPLv2" + +DEPENDS += "xapian-core" + +SRC_URI = "http://xappy.googlecode.com/files/xappy-${PV}.tar.gz" + +inherit distutils + +S = "${WORKDIR}/xappy-${PV}" + +do_stage() { + distutils_stage_all +} + -- cgit v1.2.3 From 0632eb10e87559ecfa67305b755b065389489243 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 3 Sep 2008 17:55:53 +0000 Subject: python 2.5.2 ship shlex in python-shell --- packages/python/python-2.5-manifest.inc | 4 ++-- packages/python/python_2.5.2.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'packages/python') diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc index 9ae307e7a4..68fb934e54 100644 --- a/packages/python/python-2.5-manifest.inc +++ b/packages/python/python-2.5-manifest.inc @@ -264,9 +264,9 @@ RDEPENDS_python-debugger="python-core python-io python-lang python-re python-str FILES_python-debugger="${libdir}/python2.5/bdb.* ${libdir}/python2.5/pdb.* " DESCRIPTION_python-shell="Python Shell-Like Functionality" -PR_python-shell="ml0" +PR_python-shell="ml1" RDEPENDS_python-shell="python-core python-re" -FILES_python-shell="${libdir}/python2.5/cmd.* ${libdir}/python2.5/commands.* ${libdir}/python2.5/dircache.* ${libdir}/python2.5/fnmatch.* ${libdir}/python2.5/glob.* ${libdir}/python2.5/popen2.* ${libdir}/python2.5/shutil.* " +FILES_python-shell="${libdir}/python2.5/cmd.* ${libdir}/python2.5/commands.* ${libdir}/python2.5/dircache.* ${libdir}/python2.5/fnmatch.* ${libdir}/python2.5/glob.* ${libdir}/python2.5/popen2.* ${libdir}/python2.5/shlex.* ${libdir}/python2.5/shutil.* " DESCRIPTION_python-bsddb="Python Berkeley Database Bindings" PR_python-bsddb="ml1" diff --git a/packages/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb index c68f7d5e3b..e285575149 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 db gdbm openssl readline sqlite3 tcl tk zlib" DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" # bump this on every change in contrib/python/generate-manifest-2.5.py -PR = "ml9" +PR = "ml10" PYTHON_MAJMIN = "2.5" -- cgit v1.2.3