python-numpy: remove 2 dangling patches
cover python-numpy: remove 2 dangling patches
The following changes since commit 4dd4b96b6d60246338bb30ede9f3ab1b2e757be9:
libxfont: Security Advisory - libxfont - CVE-2015-1804 (2015-04-28 07:56:01 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/python-numpy
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/python-numpy
Robert Yang (1):
python-numpy: remove 2 dangling patches
.../python/python-numpy/trycompile.diff | 36 -------------------- .../python/python-numpy/unbreak-assumptions.diff | 19 ----------- 2 files changed, 55 deletions(-) delete mode 100644 meta/recipes-devtools/python/python-numpy/trycompile.diff delete mode 100644 meta/recipes-devtools/python/python-numpy/unbreak-assumptions.diff
Signature · 1 line
1.7.9.5
PATCH 1/1 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.
--- .../python/python-numpy/trycompile.diff | 36 -------------------- .../python/python-numpy/unbreak-assumptions.diff | 19 ----------- 2 files changed, 55 deletions(-) delete mode 100644 meta/recipes-devtools/python/python-numpy/trycompile.diff delete mode 100644 meta/recipes-devtools/python/python-numpy/unbreak-assumptions.diff
meta/recipes-devtools/python/python-numpy/trycompile.diff deleted +0 -36
@@ -1,36 +0,0 @@ -Upstream-Status: Pending -Signed-off-by: Koen Kooi <[email protected]> - ---- /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. "\
meta/recipes-devtools/python/python-numpy/unbreak-assumptions.diff deleted +0 -19
@@ -1,19 +0,0 @@ -Upstream-Status: Inappropriate -Signed-off-by: Koen Kooi <[email protected]> - ---- /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:
Signature · 1 line
1.7.9.5