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 | |
| parent | 276606afe673387f5344d8156299c3ce474c5098 (diff) | |
| download | ast2050-yocto-poky-e7b12a4e63c4b5a8a9f375189ef9bd30d3aaa8f0.zip ast2050-yocto-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>
| -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 6824227..0000000 --- a/meta/recipes-devtools/python/python-numpy/trycompile.diff +++ /dev/null @@ -1,36 +0,0 @@ -Upstream-Status: Pending -Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> - ---- /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/meta/recipes-devtools/python/python-numpy/unbreak-assumptions.diff b/meta/recipes-devtools/python/python-numpy/unbreak-assumptions.diff deleted file mode 100644 index 20ec6fd..0000000 --- a/meta/recipes-devtools/python/python-numpy/unbreak-assumptions.diff +++ /dev/null @@ -1,19 +0,0 @@ -Upstream-Status: Inappropriate -Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> - ---- /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: |
