mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-05 16:28:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

python-numpy: remove 2 dangling patches

Browse Source 
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)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang
2015-04-29 02:09:18 -07:00
committed by Richard Purdie
parent f2db690d8d
commit 8cf04ed2a8
2 changed files with 0 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
meta/recipes-devtools/python/python-numpy/trycompile.diff
View File

@@ -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. "\

19
meta/recipes-devtools/python/python-numpy/unbreak-assumptions.diff
View File

@@ -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: