diff options
Diffstat (limited to 'yocto-poky/meta/recipes-devtools/python/python-numpy')
10 files changed, 108 insertions, 13 deletions
diff --git a/yocto-poky/meta/recipes-devtools/python/python-numpy/no-host-paths.patch b/yocto-poky/meta/recipes-devtools/python/python-numpy/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch index d74503680..5b134edf0 100644 --- a/yocto-poky/meta/recipes-devtools/python/python-numpy/no-host-paths.patch +++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch @@ -1,18 +1,27 @@ -Don't search /usr and so on for libraries by default to avoid host contamination. +From cc2ce6d8b6a3e6e2c8874896c10897034a80cd4f 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] 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) Signed-off-by: Ross Burton <ross.burton@intel.com> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + 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 bac90fb..a63d796 100644 +index 9dd48e2..80e197a 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py -@@ -191,41 +191,12 @@ if sys.platform == 'win32': +@@ -204,51 +204,13 @@ if sys.platform == 'win32': default_x11_lib_dirs = [] default_x11_include_dirs = [] else: - default_lib_dirs = libpaths(['/usr/local/lib', '/opt/lib', '/usr/lib', - '/opt/local/lib', '/sw/lib'], platform_bits) + default_runtime_dirs = [] - default_include_dirs = ['/usr/local/include', - '/opt/include', '/usr/include', - # path of umfpack under macports @@ -35,17 +44,26 @@ index bac90fb..a63d796 100644 - '/usr/include/X11']) - - import subprocess as sp +- tmp = None - try: +- # Explicitly open/close file to avoid ResourceWarning when +- # tests are run in debug mode Python 3. +- tmp = open(os.devnull, 'w') - p = sp.Popen(["gcc", "-print-multiarch"], stdout=sp.PIPE, -- stderr=open(os.devnull, 'w')) -- except OSError: -- pass # gcc is not installed +- stderr=tmp) +- except (OSError, DistutilsError): +- # OSError if gcc is not installed, or SandboxViolation (DistutilsError +- # subclass) if an old setuptools bug is triggered (see gh-3160). +- pass - else: - triplet = str(p.communicate()[0].decode().strip()) - if p.returncode == 0: - # gcc supports the "-print-multiarch" option - default_x11_lib_dirs += [os.path.join("/usr/lib/", triplet)] - default_lib_dirs += [os.path.join("/usr/lib/", triplet)] +- finally: +- if tmp is not None: +- tmp.close() + default_lib_dirs = libpaths(['/deadir/lib'], platform_bits) + default_include_dirs = ['/deaddir/include'] + default_src_dirs = ['.', '/deaddir/src'] @@ -55,3 +73,6 @@ index bac90fb..a63d796 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.6.2 + diff --git a/yocto-poky/meta/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h index be57ac27b..191e5a19e 100644 --- a/yocto-poky/meta/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h +++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/aarch64/_numpyconfig.h @@ -20,10 +20,11 @@ #define NPY_HAVE_COMPLEX_DOUBLE 1 #define NPY_HAVE_COMPLEX_FLOAT 1 #define NPY_HAVE_COMPLEX_LONG_DOUBLE 1 +#define NPY_ENABLE_SEPARATE_COMPILATION 1 #define NPY_USE_C99_FORMATS 1 #define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden"))) #define NPY_ABI_VERSION 0x01000009 -#define NPY_API_VERSION 0x00000007 +#define NPY_API_VERSION 0x0000000A #ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS 1 diff --git a/yocto-poky/meta/recipes-devtools/python/python-numpy/add-glibc-check.patch b/yocto-poky/meta/recipes-devtools/python/python-numpy/add-glibc-check.patch new file mode 100644 index 000000000..29768f34d --- /dev/null +++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/add-glibc-check.patch @@ -0,0 +1,36 @@ +Dont punish musl for glibc's trignometeric functions problems +additionally ensure that glibc specific macros are not used +unconditionally + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending +Index: numpy-1.10.4/numpy/core/src/private/npy_config.h +=================================================================== +--- numpy-1.10.4.orig/numpy/core/src/private/npy_config.h ++++ numpy-1.10.4/numpy/core/src/private/npy_config.h +@@ -75,10 +75,12 @@ + + #if defined(HAVE_FEATURES_H) + #include <features.h> ++#ifdef __GLIBC__ + #define TRIG_OK __GLIBC_PREREQ(2, 16) + #else + #define TRIG_OK 0 + #endif ++#endif + + #if !TRIG_OK + #undef HAVE_CASIN +Index: numpy-1.10.4/numpy/core/src/npymath/ieee754.c.src +=================================================================== +--- numpy-1.10.4.orig/numpy/core/src/npymath/ieee754.c.src ++++ numpy-1.10.4/numpy/core/src/npymath/ieee754.c.src +@@ -612,7 +612,7 @@ void npy_set_floatstatus_invalid(void) + } + + +-#elif defined(__GLIBC__) || defined(__APPLE__) || \ ++#elif defined(__linux__) || defined(__APPLE__) || \ + defined(__CYGWIN__) || defined(__MINGW32__) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) + # include <fenv.h> diff --git a/yocto-poky/meta/recipes-devtools/python/python-numpy/mips/_numpyconfig.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/mips/_numpyconfig.h index c0c42851b..05d2b8b94 100644 --- a/yocto-poky/meta/recipes-devtools/python/python-numpy/mips/_numpyconfig.h +++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/mips/_numpyconfig.h @@ -8,6 +8,7 @@ #define NPY_SIZEOF_COMPLEX_DOUBLE 16 #define NPY_SIZEOF_LONGDOUBLE 8 #define NPY_SIZEOF_COMPLEX_LONGDOUBLE 16 +#define NPY_ENABLE_SEPARATE_COMPILATION 1 #define NPY_SIZEOF_PY_INTPTR_T 4 #define NPY_SIZEOF_PY_LONG_LONG 8 #define NPY_SIZEOF_LONGLONG 8 @@ -23,7 +24,7 @@ #define NPY_USE_C99_FORMATS 1 #define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden"))) #define NPY_ABI_VERSION 0x01000009 -#define NPY_API_VERSION 0x00000007 +#define NPY_API_VERSION 0x0000000A #ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS 1 diff --git a/yocto-poky/meta/recipes-devtools/python/python-numpy/mips64/_numpyconfig.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/mips64/_numpyconfig.h index be57ac27b..8e2b5d094 100644 --- a/yocto-poky/meta/recipes-devtools/python/python-numpy/mips64/_numpyconfig.h +++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/mips64/_numpyconfig.h @@ -8,6 +8,7 @@ #define NPY_SIZEOF_COMPLEX_DOUBLE 16 #define NPY_SIZEOF_LONGDOUBLE 16 #define NPY_SIZEOF_COMPLEX_LONGDOUBLE 32 +#define NPY_ENABLE_SEPARATE_COMPILATION 1 #define NPY_SIZEOF_PY_INTPTR_T 8 #define NPY_SIZEOF_PY_LONG_LONG 8 #define NPY_SIZEOF_LONGLONG 8 @@ -23,7 +24,7 @@ #define NPY_USE_C99_FORMATS 1 #define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden"))) #define NPY_ABI_VERSION 0x01000009 -#define NPY_API_VERSION 0x00000007 +#define NPY_API_VERSION 0x0000000A #ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS 1 diff --git a/yocto-poky/meta/recipes-devtools/python/python-numpy/mips64n32/_numpyconfig.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/mips64n32/_numpyconfig.h index be57ac27b..8e2b5d094 100644 --- a/yocto-poky/meta/recipes-devtools/python/python-numpy/mips64n32/_numpyconfig.h +++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/mips64n32/_numpyconfig.h @@ -8,6 +8,7 @@ #define NPY_SIZEOF_COMPLEX_DOUBLE 16 #define NPY_SIZEOF_LONGDOUBLE 16 #define NPY_SIZEOF_COMPLEX_LONGDOUBLE 32 +#define NPY_ENABLE_SEPARATE_COMPILATION 1 #define NPY_SIZEOF_PY_INTPTR_T 8 #define NPY_SIZEOF_PY_LONG_LONG 8 #define NPY_SIZEOF_LONGLONG 8 @@ -23,7 +24,7 @@ #define NPY_USE_C99_FORMATS 1 #define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden"))) #define NPY_ABI_VERSION 0x01000009 -#define NPY_API_VERSION 0x00000007 +#define NPY_API_VERSION 0x0000000A #ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS 1 diff --git a/yocto-poky/meta/recipes-devtools/python/python-numpy/powerpc/_numpyconfig.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/powerpc/_numpyconfig.h index 73cbfb1ba..0f45d5bd4 100644 --- a/yocto-poky/meta/recipes-devtools/python/python-numpy/powerpc/_numpyconfig.h +++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/powerpc/_numpyconfig.h @@ -8,6 +8,7 @@ #define NPY_SIZEOF_COMPLEX_DOUBLE 16 #define NPY_SIZEOF_LONGDOUBLE 16 #define NPY_SIZEOF_COMPLEX_LONGDOUBLE 32 +#define NPY_ENABLE_SEPARATE_COMPILATION 1 #define NPY_SIZEOF_PY_INTPTR_T 4 #define NPY_SIZEOF_PY_LONG_LONG 8 #define NPY_SIZEOF_LONGLONG 8 @@ -23,7 +24,7 @@ #define NPY_USE_C99_FORMATS 1 #define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden"))) #define NPY_ABI_VERSION 0x01000009 -#define NPY_API_VERSION 0x00000007 +#define NPY_API_VERSION 0x0000000A #ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS 1 diff --git a/yocto-poky/meta/recipes-devtools/python/python-numpy/powerpc64/_numpyconfig.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/powerpc64/_numpyconfig.h index be57ac27b..8e2b5d094 100644 --- a/yocto-poky/meta/recipes-devtools/python/python-numpy/powerpc64/_numpyconfig.h +++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/powerpc64/_numpyconfig.h @@ -8,6 +8,7 @@ #define NPY_SIZEOF_COMPLEX_DOUBLE 16 #define NPY_SIZEOF_LONGDOUBLE 16 #define NPY_SIZEOF_COMPLEX_LONGDOUBLE 32 +#define NPY_ENABLE_SEPARATE_COMPILATION 1 #define NPY_SIZEOF_PY_INTPTR_T 8 #define NPY_SIZEOF_PY_LONG_LONG 8 #define NPY_SIZEOF_LONGLONG 8 @@ -23,7 +24,7 @@ #define NPY_USE_C99_FORMATS 1 #define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden"))) #define NPY_ABI_VERSION 0x01000009 -#define NPY_API_VERSION 0x00000007 +#define NPY_API_VERSION 0x0000000A #ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS 1 diff --git a/yocto-poky/meta/recipes-devtools/python/python-numpy/remove-build-path-in-comments.patch b/yocto-poky/meta/recipes-devtools/python/python-numpy/remove-build-path-in-comments.patch new file mode 100644 index 000000000..eb8a71a2e --- /dev/null +++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/remove-build-path-in-comments.patch @@ -0,0 +1,30 @@ +From c560abff71f98a39a7401f08c2c13dad9ae7f15f Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Thu, 25 Feb 2016 01:23:32 -0500 +Subject: [PATCH] remove build path in comments + +It has build path in comments, so remove it. + +Upstream-Status: Inappropriate [openembedded specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + numpy/distutils/misc_util.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py +index 345e60f..dafb068 100644 +--- a/numpy/distutils/misc_util.py ++++ b/numpy/distutils/misc_util.py +@@ -2254,7 +2254,7 @@ def generate_config_py(target): + from distutils.dir_util import mkpath + mkpath(os.path.dirname(target)) + f = open(target, 'w') +- f.write('# This file is generated by %s\n' % (os.path.abspath(sys.argv[0]))) ++ f.write('# This file is generated by %s\n' % (os.path.abspath(sys.argv[0]).replace(os.path.abspath('../'),''))) + f.write('# It contains system_info results at the time of building this package.\n') + f.write('__all__ = ["get_info","show"]\n\n') + for k, i in system_info.saved_results.items(): +-- +1.9.1 + diff --git a/yocto-poky/meta/recipes-devtools/python/python-numpy/x86-64/_numpyconfig.h b/yocto-poky/meta/recipes-devtools/python/python-numpy/x86-64/_numpyconfig.h index be57ac27b..b33036164 100644 --- a/yocto-poky/meta/recipes-devtools/python/python-numpy/x86-64/_numpyconfig.h +++ b/yocto-poky/meta/recipes-devtools/python/python-numpy/x86-64/_numpyconfig.h @@ -5,9 +5,11 @@ #define NPY_SIZEOF_FLOAT 4 #define NPY_SIZEOF_COMPLEX_FLOAT 8 #define NPY_SIZEOF_DOUBLE 8 +#define NPY_SIZEOF_OFF_T 8 #define NPY_SIZEOF_COMPLEX_DOUBLE 16 #define NPY_SIZEOF_LONGDOUBLE 16 #define NPY_SIZEOF_COMPLEX_LONGDOUBLE 32 +#define NPY_ENABLE_SEPARATE_COMPILATION 1 #define NPY_SIZEOF_PY_INTPTR_T 8 #define NPY_SIZEOF_PY_LONG_LONG 8 #define NPY_SIZEOF_LONGLONG 8 @@ -23,7 +25,7 @@ #define NPY_USE_C99_FORMATS 1 #define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden"))) #define NPY_ABI_VERSION 0x01000009 -#define NPY_API_VERSION 0x00000007 +#define NPY_API_VERSION 0x0000000A #ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS 1 |
