diff options
| -rw-r--r-- | meta/recipes-devtools/python/python-numpy/trycompile.diff | 36 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python-numpy/unbreak-assumptions.diff | 19 |
2 files changed, 0 insertions, 55 deletions
diff --git a/meta/recipes-devtools/python/python-numpy/trycompile.diff b/meta/recipes-devtools/python/python-numpy/trycompile.diff deleted file mode 100644 index 6824227cff..0000000000 --- a/meta/recipes-devtools/python/python-numpy/trycompile.diff +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
| 3 | |||
| 4 | --- /tmp/setup.py 2008-09-01 10:37:44.000000000 +0200 | ||
| 5 | +++ numpy-1.1.1/numpy/core/setup.py 2008-09-01 10:38:20.373198000 +0200 | ||
| 6 | @@ -80,8 +80,7 @@ | ||
| 7 | raise SystemError,\ | ||
| 8 | "Non-existing %s. Perhaps you need to install"\ | ||
| 9 | " python-dev|python-devel." % (python_h) | ||
| 10 | - result = config_cmd.try_run(tc,include_dirs=[python_include], | ||
| 11 | - library_dirs = default_lib_dirs) | ||
| 12 | + result = config_cmd.try_compile(tc) | ||
| 13 | if not result: | ||
| 14 | raise SystemError,"Failed to test configuration. "\ | ||
| 15 | "See previous error messages for more information." | ||
| 16 | @@ -95,7 +94,7 @@ | ||
| 17 | if mathlib: | ||
| 18 | mathlibs_choices.insert(0,mathlib.split(',')) | ||
| 19 | for libs in mathlibs_choices: | ||
| 20 | - if config_cmd.try_run(tc,libraries=libs): | ||
| 21 | + if config_cmd.try_compile(tc): | ||
| 22 | mathlibs = libs | ||
| 23 | break | ||
| 24 | else: | ||
| 25 | @@ -180,10 +179,7 @@ | ||
| 26 | " python-dev|python-devel." % (python_h) | ||
| 27 | |||
| 28 | config.numpy_include_dirs | ||
| 29 | - result = config_cmd.try_run(testcode, | ||
| 30 | - include_dirs = [python_include] + \ | ||
| 31 | - config.numpy_include_dirs, | ||
| 32 | - library_dirs = default_lib_dirs) | ||
| 33 | + result = config_cmd.try_compile(testcode) | ||
| 34 | |||
| 35 | if not result: | ||
| 36 | raise SystemError,"Failed to generate numpy configuration. "\ | ||
diff --git a/meta/recipes-devtools/python/python-numpy/unbreak-assumptions.diff b/meta/recipes-devtools/python/python-numpy/unbreak-assumptions.diff deleted file mode 100644 index 20ec6fdbc7..0000000000 --- a/meta/recipes-devtools/python/python-numpy/unbreak-assumptions.diff +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | Upstream-Status: Inappropriate | ||
| 2 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
| 3 | |||
| 4 | --- /tmp/system_info.py 2008-08-22 00:38:16.000000000 +0200 | ||
| 5 | +++ numpy-1.1.1/numpy/distutils/system_info.py 2008-08-22 00:40:33.013198000 +0200 | ||
| 6 | @@ -137,11 +137,8 @@ | ||
| 7 | default_x11_lib_dirs = [] | ||
| 8 | default_x11_include_dirs = [] | ||
| 9 | else: | ||
| 10 | - default_lib_dirs = ['/usr/local/lib', '/opt/lib', '/usr/lib', | ||
| 11 | - '/opt/local/lib', '/sw/lib'] | ||
| 12 | - default_include_dirs = ['/usr/local/include', | ||
| 13 | - '/opt/include', '/usr/include', | ||
| 14 | - '/opt/local/include', '/sw/include'] | ||
| 15 | + default_lib_dirs = ['/non-existant-dir'] | ||
| 16 | + default_include_dirs = ['non-existant-dir'] | ||
| 17 | default_src_dirs = ['.','/usr/local/src', '/opt/src','/sw/src'] | ||
| 18 | |||
| 19 | try: | ||
