Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 19/19] python-numpy: update to 1.16.2
Date: Mon, 15 Apr 2019 12:54:57 +0200	[thread overview]
Message-ID: <20190415105457.57067-19-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20190415105457.57067-1-alex.kanavin@gmail.com>

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>
---
 ...-and-so-on-for-libraries-by-default-.patch | 16 +++++-----
 .../0001-npy_cpu-Add-riscv-support.patch      | 14 ++++-----
 .../python-numpy/files/fix_shebang_f2py.patch | 29 -------------------
 .../python-numpy/python-numpy.inc             | 10 +++----
 ...numpy_1.14.5.bb => python-numpy_1.16.2.bb} |  0
 ...umpy_1.14.5.bb => python3-numpy_1.16.2.bb} |  1 +
 6 files changed, 18 insertions(+), 52 deletions(-)
 delete mode 100644 meta/recipes-devtools/python-numpy/files/fix_shebang_f2py.patch
 rename meta/recipes-devtools/python-numpy/{python-numpy_1.14.5.bb => python-numpy_1.16.2.bb} (100%)
 rename meta/recipes-devtools/python-numpy/{python3-numpy_1.14.5.bb => python3-numpy_1.16.2.bb} (97%)

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 516ccd7b9bd..8fe0d1a27ee 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
-
diff --git a/meta/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch b/meta/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch
index 4f5c4f5f0da..4decfe66ee1 100644
--- a/meta/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch
+++ b/meta/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch
@@ -1,21 +1,20 @@
-From 30fb1bf9244bb0789c02ec7c98a923acc7200206 Mon Sep 17 00:00:00 2001
+From 629891f67601275c9c4de0bb01afcf1a8c44fa3f Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 16 Mar 2018 19:55:21 -0700
 Subject: [PATCH] npy_cpu: Add riscv support
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
 Upstream-Status: Submitted [https://github.com/numpy/numpy/pull/10761]
-
+---
  numpy/core/include/numpy/npy_cpu.h | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/numpy/core/include/numpy/npy_cpu.h b/numpy/core/include/numpy/npy_cpu.h
-index 84653ea18..9e88db873 100644
+index 5edd8f4..e1e4796 100644
 --- a/numpy/core/include/numpy/npy_cpu.h
 +++ b/numpy/core/include/numpy/npy_cpu.h
-@@ -78,6 +78,8 @@
-     #define NPY_CPU_AARCH64
+@@ -96,6 +96,8 @@
+     #define NPY_CPU_OR1K
  #elif defined(__mc68000__)
      #define NPY_CPU_M68K
 +#elif defined(__riscv)
@@ -23,6 +22,3 @@ index 84653ea18..9e88db873 100644
  #elif defined(__arc__) && defined(__LITTLE_ENDIAN__)
      #define NPY_CPU_ARCEL
  #elif defined(__arc__) && defined(__BIG_ENDIAN__)
--- 
-2.16.2
-
diff --git a/meta/recipes-devtools/python-numpy/files/fix_shebang_f2py.patch b/meta/recipes-devtools/python-numpy/files/fix_shebang_f2py.patch
deleted file mode 100644
index 8be6e4d21f9..00000000000
--- a/meta/recipes-devtools/python-numpy/files/fix_shebang_f2py.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-Avoids using python from the HOSTs native sysroot for f2py,
-uses TARGET env python instead.
-
-Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
-
-Index: numpy-1.11.0/numpy/f2py/setup.py
-===================================================================
---- numpy-1.11.0.orig/numpy/f2py/setup.py
-+++ numpy-1.11.0/numpy/f2py/setup.py
-@@ -37,10 +37,13 @@ def _get_f2py_shebang():
-     should be ``#!python`` rather than ``#!`` followed by the contents of
-     ``sys.executable``.
-     """
--    if set(('bdist_wheel', 'bdist_egg', 'bdist_wininst',
--            'bdist_rpm')).intersection(sys.argv):
--        return '#!python'
--    return '#!' + sys.executable
-+    #if set(('bdist_wheel', 'bdist_egg', 'bdist_wininst',
-+    #        'bdist_rpm')).intersection(sys.argv):
-+    #    return '#!python'
-+    #return '#!' + sys.executable
-+    
-+    # On OE, we need to avoid using the HOSTs python-native, we return env python instead
-+    return '#!/usr/bin/env python'
- 
- 
- def configuration(parent_package='', top_path=None):
diff --git a/meta/recipes-devtools/python-numpy/python-numpy.inc b/meta/recipes-devtools/python-numpy/python-numpy.inc
index 1b51f7baaf2..43c8960a184 100644
--- a/meta/recipes-devtools/python-numpy/python-numpy.inc
+++ b/meta/recipes-devtools/python-numpy/python-numpy.inc
@@ -1,17 +1,17 @@
 SUMMARY = "A sophisticated Numeric Processing Package for Python"
 SECTION = "devel/python"
 LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fc53b33304171d132128ebe82ea4a645"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d26bde5432613cce2334b93985576231"
 
 SRCNAME = "numpy"
 
 SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${SRCNAME}-${PV}.tar.gz \
            file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \
-           file://fix_shebang_f2py.patch \
            file://0001-npy_cpu-Add-riscv-support.patch \
-           ${CONFIGFILESURI} "
-SRC_URI[md5sum] = "e3189ee851c3a0e2e6e4c6e80a711ec8"
-SRC_URI[sha256sum] = "1b4a02758fb68a65ea986d808867f1d6383219c234aef553a8741818e795b529"
+           ${CONFIGFILESURI} \
+           "
+SRC_URI[md5sum] = "4fc754be7ec3e0f80b042d907e99f4ad"
+SRC_URI[sha256sum] = "8088221e6e27da8d5907729f0bfe798f526836f22cc59ae83a0f867e67416a3e"
 
 UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
diff --git a/meta/recipes-devtools/python-numpy/python-numpy_1.14.5.bb b/meta/recipes-devtools/python-numpy/python-numpy_1.16.2.bb
similarity index 100%
rename from meta/recipes-devtools/python-numpy/python-numpy_1.14.5.bb
rename to meta/recipes-devtools/python-numpy/python-numpy_1.16.2.bb
diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.14.5.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.16.2.bb
similarity index 97%
rename from meta/recipes-devtools/python-numpy/python3-numpy_1.14.5.bb
rename to meta/recipes-devtools/python-numpy/python3-numpy_1.16.2.bb
index 915e6f8c2b3..d388e88d25e 100644
--- a/meta/recipes-devtools/python-numpy/python3-numpy_1.14.5.bb
+++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.16.2.bb
@@ -1,2 +1,3 @@
 inherit setuptools3
 require python-numpy.inc
+
-- 
2.17.1



  parent reply	other threads:[~2019-04-15 10:55 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-15 10:54 [PATCH 01/19] gobject-introspection: update to 1.60.1 Alexander Kanavin
2019-04-15 10:54 ` [PATCH 02/19] dtc: upgrade 1.4.7 -> 1.5.0 Alexander Kanavin
2019-04-15 10:54 ` [PATCH 03/19] webkitgtk: update to 2.24.0 Alexander Kanavin
2019-04-15 10:54 ` [PATCH 04/19] libdazzle: update to 3.32.1 Alexander Kanavin
2019-04-15 10:54 ` [PATCH 05/19] epiphany: update to 3.32.1.2 Alexander Kanavin
2019-04-15 20:00   ` Richard Purdie
2019-04-15 10:54 ` [PATCH 06/19] vala: update to 0.44.3 Alexander Kanavin
2019-04-17  4:04   ` Khem Raj
2019-04-15 10:54 ` [PATCH 07/19] libdnf: update to 0.28.1 Alexander Kanavin
2019-04-15 10:54 ` [PATCH 08/19] libcomps: upgrade 0.1.10 -> 0.1.11 Alexander Kanavin
2019-04-15 10:54 ` [PATCH 09/19] dnf: upgrade 4.1.0 -> 4.2.2 Alexander Kanavin
2019-04-15 10:54 ` [PATCH 10/19] btrfs-tools: upgrade 4.20.1 -> 4.20.2 Alexander Kanavin
2019-04-15 10:54 ` [PATCH 11/19] meson: update to 0.50.0 Alexander Kanavin
2019-04-23  9:28   ` Burton, Ross
2019-04-15 10:54 ` [PATCH 12/19] libmodulemd: update to 2.2.3 Alexander Kanavin
2019-04-15 10:54 ` [PATCH 13/19] at-spi2-core: fix meson 0.50 build Alexander Kanavin
2019-04-15 10:54 ` [PATCH 14/19] ffmpeg: update to 4.1.3 Alexander Kanavin
2019-04-15 10:54 ` [PATCH 15/19] icu: update to 64.1 Alexander Kanavin
2019-04-15 19:58   ` Richard Purdie
2019-04-15 10:54 ` [PATCH 16/19] python: update to 2.7.16 Alexander Kanavin
2019-04-15 10:54 ` [PATCH 17/19] python: update to 3.7.3 Alexander Kanavin
2019-04-15 10:54 ` [PATCH 18/19] python3-pygobject: update to 3.32.0 Alexander Kanavin
2019-04-16  8:19   ` Richard Purdie
2019-04-15 10:54 ` Alexander Kanavin [this message]
2019-04-17 21:04 ` [PATCH 01/19] gobject-introspection: update to 1.60.1 Khem Raj

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190415105457.57067-19-alex.kanavin@gmail.com \
    --to=alex.kanavin@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox