diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-04-29 02:09:18 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-28 09:44:04 +0100 |
commit | e7b12a4e63c4b5a8a9f375189ef9bd30d3aaa8f0 (patch) | |
tree | 71baf228ceae0d7e01abd09a5496e8d401e83c09 /meta/recipes-devtools/python/python-numpy/trycompile.diff | |
parent | 276606afe673387f5344d8156299c3ce474c5098 (diff) | |
download | poky-e7b12a4e63c4b5a8a9f375189ef9bd30d3aaa8f0.tar.gz |
python-numpy: remove 2 dangling patches
Removed:
- unbreak-assumptions.diff
This patch changs the dir to /non-existant-dir, the source code has
changed the dir to /deadir, so it is not needed any more.
- trycompile.diff
There is no try_compile or try_run in numpy/core/setup.py any more, so
assumed that it is not needed.
(From OE-Core rev: 56aac948ca9686d79a2c56f4f034f8de445ff37b)
(From OE-Core rev: 7f0d86dd43a10a981aa2ad8acde66fe345fe4096)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python-numpy/trycompile.diff')
-rw-r--r-- | meta/recipes-devtools/python/python-numpy/trycompile.diff | 36 |
1 files changed, 0 insertions, 36 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. "\ | ||