summaryrefslogtreecommitdiffstats
path: root/meta-python
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2022-09-07 14:39:41 -0700
committerKhem Raj <raj.khem@gmail.com>2022-09-07 16:44:54 -0700
commit1274e2772ebbf04f6e6af6aec53f5d23ae259874 (patch)
treee8d3ea08eb2bae7c8edd327f585c4955d0d09817 /meta-python
parent67caf9050d6ba5a20ae576a5924265e74816cb3d (diff)
downloadmeta-openembedded-1274e2772ebbf04f6e6af6aec53f5d23ae259874.tar.gz
matplotlib: Upgrade to 3.5.3
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-python')
-rw-r--r--meta-python/recipes-devtools/python/python3-matplotlib/matplotlib-disable-download.patch5
-rw-r--r--meta-python/recipes-devtools/python/python3-matplotlib_3.5.3.bb (renamed from meta-python/recipes-devtools/python/python3-matplotlib_3.5.2.bb)6
2 files changed, 6 insertions, 5 deletions
diff --git a/meta-python/recipes-devtools/python/python3-matplotlib/matplotlib-disable-download.patch b/meta-python/recipes-devtools/python/python3-matplotlib/matplotlib-disable-download.patch
index 42ffeb8970..25c49afb97 100644
--- a/meta-python/recipes-devtools/python/python3-matplotlib/matplotlib-disable-download.patch
+++ b/meta-python/recipes-devtools/python/python3-matplotlib/matplotlib-disable-download.patch
@@ -6,10 +6,11 @@ Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
6 6
7--- a/setup.py 7--- a/setup.py
8+++ b/setup.py 8+++ b/setup.py
9@@ -317,7 +317,6 @@ setup( # Finally, pass this all along t 9@@ -316,8 +316,6 @@ setup( # Finally, pass this all along t
10 setup_requires=[
10 "certifi>=2020.06.20", 11 "certifi>=2020.06.20",
11 "numpy>=1.17", 12 "numpy>=1.17",
12 "setuptools_scm>=4", 13- "setuptools_scm>=4,<7",
13- "setuptools_scm_git_archive", 14- "setuptools_scm_git_archive",
14 ], 15 ],
15 install_requires=[ 16 install_requires=[
diff --git a/meta-python/recipes-devtools/python/python3-matplotlib_3.5.2.bb b/meta-python/recipes-devtools/python/python3-matplotlib_3.5.3.bb
index eaa144719b..1a0b93b030 100644
--- a/meta-python/recipes-devtools/python/python3-matplotlib_3.5.2.bb
+++ b/meta-python/recipes-devtools/python/python3-matplotlib_3.5.3.bb
@@ -19,9 +19,9 @@ DEPENDS = "\
19 python3-dateutil-native \ 19 python3-dateutil-native \
20 python3-pytz-native \ 20 python3-pytz-native \
21 python3-certifi-native \ 21 python3-certifi-native \
22 python3-setuptools-scm-native \
22" 23"
23 24SRC_URI[sha256sum] = "339cac48b80ddbc8bfd05daae0a3a73414651a8596904c2a881cfd1edb65f26c"
24SRC_URI[sha256sum] = "48cf850ce14fa18067f2d9e0d646763681948487a8080ec0af2686468b4607a2"
25 25
26inherit pypi setuptools3 pkgconfig 26inherit pypi setuptools3 pkgconfig
27 27
@@ -40,7 +40,6 @@ SRC_URI[qhull.sha256sum] = "b5c2d7eb833278881b952c8a52d20179eab87766b00b86500046
40# LTO with clang needs lld 40# LTO with clang needs lld
41LDFLAGS:append:toolchain-clang = " -fuse-ld=lld" 41LDFLAGS:append:toolchain-clang = " -fuse-ld=lld"
42LDFLAGS:remove:toolchain-clang:mips = "-fuse-ld=lld" 42LDFLAGS:remove:toolchain-clang:mips = "-fuse-ld=lld"
43
44RDEPENDS:${PN} = "\ 43RDEPENDS:${PN} = "\
45 freetype \ 44 freetype \
46 libpng \ 45 libpng \
@@ -57,6 +56,7 @@ RDEPENDS:${PN} = "\
57ENABLELTO:toolchain-clang:riscv64 = "echo enable_lto = False >> ${S}/mplsetup.cfg" 56ENABLELTO:toolchain-clang:riscv64 = "echo enable_lto = False >> ${S}/mplsetup.cfg"
58ENABLELTO:toolchain-clang:riscv32 = "echo enable_lto = False >> ${S}/mplsetup.cfg" 57ENABLELTO:toolchain-clang:riscv32 = "echo enable_lto = False >> ${S}/mplsetup.cfg"
59ENABLELTO:toolchain-clang:mips = "echo enable_lto = False >> ${S}/mplsetup.cfg" 58ENABLELTO:toolchain-clang:mips = "echo enable_lto = False >> ${S}/mplsetup.cfg"
59
60do_compile:prepend() { 60do_compile:prepend() {
61 echo [libs] > ${S}/mplsetup.cfg 61 echo [libs] > ${S}/mplsetup.cfg
62 echo system_freetype = True >> ${S}/mplsetup.cfg 62 echo system_freetype = True >> ${S}/mplsetup.cfg