summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-08-31 16:12:35 +0000
committerKoen Kooi <koen@openembedded.org>2008-08-31 16:12:35 +0000
commit443f6022df06d9f9dc221011c1744274deff2c2c (patch)
tree8d51bf28d9acd67c873f4be24185fd0787110061
parentf7c13c3a168ab9682f0322b335cb0a3573d82ee4 (diff)
python-numpy: fix wrong include paths, but it still tries to run generated code during configure
* it wraps scons with distutils. crazy python dudes
-rw-r--r--packages/python/python-numpy/.mtn2git_empty0
-rw-r--r--packages/python/python-numpy/unbreak-assumptions.diff16
-rw-r--r--packages/python/python-numpy_1.1.1.bb4
3 files changed, 19 insertions, 1 deletions
diff --git a/packages/python/python-numpy/.mtn2git_empty b/packages/python/python-numpy/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/python/python-numpy/.mtn2git_empty
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