Skip to contentSkip to conversation

python3-matplotlib: Disable LTO on mips/clang

PATCH In review Khem Raj 2 participants 3 messages Dec 14, 2020 – Dec 15, 2020

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 python3-matplotlib: Disable LTO on mips/clang

It needs lld with lto and lld does not yet support gnu_hash for mips

---
 meta-python/recipes-devtools/python/python3-matplotlib_3.3.2.bb | 2 ++
 1 file changed, 2 insertions(+)
meta-python/recipes-devtools/python/python3-matplotlib_3.3.2.bb +2 -0
index 3cfa3f31f4..25709a1176 100644
@@ -26,6 +26,7 @@ inherit pypi setuptools3 pkgconfig
 
 # LTO with clang needs lld
 LDFLAGS_append_toolchain-clang = " -fuse-ld=lld"
+LDFLAGS_remove_toolchain-clang_mips = "-fuse-ld=lld"
 
 RDEPENDS_${PN} = "\
     freetype \
@@ -40,6 +41,7 @@ RDEPENDS_${PN} = "\
 
 ENABLELTO_toolchain-clang_riscv64 = "echo enable_lto = False >> ${S}/setup.cfg"
 ENABLELTO_toolchain-clang_riscv32 = "echo enable_lto = False >> ${S}/setup.cfg"
+ENABLELTO_toolchain-clang_mips = "echo enable_lto = False >> ${S}/setup.cfg"
 do_compile_prepend() {
     echo [libs] > ${S}/setup.cfg
     echo system_freetype = true >> ${S}/setup.cfg
Signature · 1 line
2.29.2
author
#1 lore raw

PATCH 2/2 redis: Update to 6.0.9

---
 .../recipes-extended/redis/{redis_6.0.8.bb => redis_6.0.9.bb} | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
 rename meta-oe/recipes-extended/redis/{redis_6.0.8.bb => redis_6.0.9.bb} (94%)
meta-oe/recipes-extended/redis/redis_6.0.9.bb renamed from meta-oe/recipes-extended/redis/redis_6.0.8.bb +1 -3
similarity index 94%
rename from meta-oe/recipes-extended/redis/redis_6.0.8.bb
rename to meta-oe/recipes-extended/redis/redis_6.0.9.bb
index 14091b565c..50571ed550 100644
@@ -18,9 +18,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
            file://riscv32.patch \
            file://ilp32.patch \
            "
-
-SRC_URI[md5sum] = "70113b4b8ea7ee4c7e148be62b5d1e0b"
-SRC_URI[sha256sum] = "04fa1fddc39bd1aecb6739dd5dd73858a3515b427acd1e2947a66dadce868d68"
+SRC_URI[sha256sum] = "dc2bdcf81c620e9f09cfd12e85d3bc631c897b2db7a55218fd8a65eaa37f86dd"
 
 inherit autotools-brokensep update-rc.d systemd useradd
 
Signature · 1 line
2.29.2
Acked-by on v1 1/2
#2 lore raw
In reply to Khem Raj
Quoted 5 lines · Khem Raj

[Please note this e-mail is from an EXTERNAL e-mail address]

It needs lld with lto and lld does not yet support gnu_hash for mips

Quoted 30 lines
---
  meta-python/recipes-devtools/python/python3-matplotlib_3.3.2.bb | 2 ++
  1 file changed, 2 insertions(+)
meta-python/recipes-devtools/python/python3-matplotlib_3.3.2.bb +2 -1
index 3cfa3f31f4..25709a1176 100644
@@ -26,6 +26,7 @@ inherit pypi setuptools3 pkgconfig
 
  # LTO with clang needs lld
  LDFLAGS_append_toolchain-clang = " -fuse-ld=lld"
+LDFLAGS_remove_toolchain-clang_mips = "-fuse-ld=lld"
 
  RDEPENDS_${PN} = "\
      freetype \
@@ -40,6 +41,7 @@ RDEPENDS_${PN} = "\
 
  ENABLELTO_toolchain-clang_riscv64 = "echo enable_lto = False >> ${S}/setup.cfg"
  ENABLELTO_toolchain-clang_riscv32 = "echo enable_lto = False >> ${S}/setup.cfg"
+ENABLELTO_toolchain-clang_mips = "echo enable_lto = False >> ${S}/setup.cfg"
  do_compile_prepend() {
      echo [libs] > ${S}/setup.cfg
      echo system_freetype = true >> ${S}/setup.cfg
--

2.29.2