diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2019-04-15 12:54:57 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-16 11:05:50 +0100 |
| commit | 90e271e9f1c1ecdb205bca3c9b4976a1a16e83b1 (patch) | |
| tree | 266514badfe13a98513ca54534e3b9b0f99b6ead /meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch | |
| parent | a215296bb1b6a87da3692ef0e6176e56310b05f2 (diff) | |
| download | openembedded-core-contrib-90e271e9f1c1ecdb205bca3c9b4976a1a16e83b1.tar.gz | |
python-numpy: update to 1.16.2
Drop files/fix_shebang_f2py.patch as the code has been removed upstream.
License-update: copyright years, file paths.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch')
| -rw-r--r-- | meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch b/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch index 516ccd7b9b..8fe0d1a27e 100644 --- a/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch +++ b/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch @@ -1,7 +1,8 @@ -From c8c6649b29a08f82e1d6761a6d62ce5f632313c5 Mon Sep 17 00:00:00 2001 +From c14554c7e2fff8dd559dfb41e7dd11392c6f85e3 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 10 Dec 2015 13:20:30 +0200 -Subject: [PATCH 1/3] Don't search /usr and so on for libraries by default to +Subject: [PATCH] Don't search /usr and so on for libraries by default to + avoid host contamination. Upstream-Status: Inappropriate (As the code stands, this is a hack) @@ -9,16 +10,16 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- - numpy/distutils/system_info.py | 50 +++++------------------------------------- + numpy/distutils/system_info.py | 50 ++++------------------------------ 1 file changed, 6 insertions(+), 44 deletions(-) diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py -index bea120c..544e056 100644 +index 2424943..bf56a6d 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py -@@ -262,51 +262,13 @@ if sys.platform == 'win32': +@@ -274,51 +274,13 @@ if sys.platform == 'win32': add_system_root(os.path.join(conda_dir, 'Library')) - + else: - default_lib_dirs = libpaths(['/usr/local/lib', '/opt/lib', '/usr/lib', - '/opt/local/lib', '/sw/lib'], platform_bits) @@ -74,6 +75,3 @@ index bea120c..544e056 100644 if os.path.join(sys.prefix, 'lib') not in default_lib_dirs: default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib')) --- -2.16.1 - |