Skip to contentSkip to conversation

: fix build failure caused by zstd

PATCH In review Hsia-Jun Li 2 participants 4 messages Aug 30, 2021

lore
Share & tools
lore
#0 lore raw

cover : fix build failure caused by zstd

From: "Hsia-Jun(Randy) Li" <[email protected]>

The configure script of some packages may not be able to handle this correctly.

I have not verified all the packages, I was developing something for meta-clang actually.

Hsia-Jun(Randy) Li (2):
curl: fix the dependency to zstd
gcc: disable zstd by default

 meta/recipes-devtools/gcc/gcc-11.2.inc   | 2 ++
 meta/recipes-support/curl/curl_7.78.0.bb | 1 +
 2 files changed, 3 insertions(+)
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/2 curl: fix the dependency to zstd

From: "Hsia-Jun(Randy) Li" <[email protected]>

It would be enabled by default but I am not sure whether we need it.

---
 meta/recipes-support/curl/curl_7.78.0.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-support/curl/curl_7.78.0.bb +1 -0
index dece0ba..c779d8f 100644
@@ -55,6 +55,7 @@ PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp,"
 PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares"
 PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose"
 PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib"
+PACKAGECONFIG[zstd] = ",--without-zstd,zstd"
 
 EXTRA_OECONF = " \
     --disable-libcurl-option \
Signature · 1 line
2.7.4
#2 lore raw

PATCH 2/2 gcc: disable zstd by default

In reply to Hsia-Jun Li

From: "Hsia-Jun(Randy) Li" <[email protected]>

I think this script is a little trick, unless you disable it, it would consider it enabled anyway.

---
 meta/recipes-devtools/gcc/gcc-11.2.inc | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-devtools/gcc/gcc-11.2.inc +2 -0
index 9fd30f5..77dd94e 100644
@@ -90,6 +90,7 @@ EXTRA_OECONF_BASE = "\
     --enable-lto \
     --disable-bootstrap \
     --with-system-zlib \
+    --with-zstd=no \
     ${@'--with-linker-hash-style=${LINKER_HASH_STYLE}' if '${LINKER_HASH_STYLE}' else ''} \
     --enable-linker-build-id \
     --with-ppl=no \
@@ -105,6 +106,7 @@ EXTRA_OECONF_INITIAL = "\
     --disable-libquadmath \
     --with-system-zlib \
     --disable-lto \
+    --with-zstd=no \
     --disable-plugin \
     --enable-linker-build-id \
     --enable-decimal-float=no \
Signature · 1 line
2.7.4
#3 lore raw

Re: [OE-core] [PATCH 2/2] gcc: disable zstd by default

Quoted 24 lines · Hsia-Jun Li

From: "Hsia-Jun(Randy) Li" <[email protected]>

I think this script is a little trick, unless you disable it, it would consider it enabled anyway.

---
 meta/recipes-devtools/gcc/gcc-11.2.inc | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-devtools/gcc/gcc-11.2.inc +1 -0
index 9fd30f5..77dd94e 100644
@@ -90,6 +90,7 @@ EXTRA_OECONF_BASE = "\
     --enable-lto \
     --disable-bootstrap \
     --with-system-zlib \
+    --with-zstd=no \
     ${@'--with-linker-hash-style=${LINKER_HASH_STYLE}' if '${LINKER_HASH_STYLE}' else ''} \
     --enable-linker-build-id \
     --with-ppl=no \

meta/recipes-devtools/gcc/gcc-11.2.inc EXTRA_OECONF_INITIAL = "\

Quoted 8 lines
meta/recipes-devtools/gcc/gcc-11.2.inc +1 -1
@@ -105,6 +106,7 @@ EXTRA_OECONF_INITIAL = "\
     --disable-libquadmath \
     --with-system-zlib \
     --disable-lto \
+    --with-zstd=no \
     --disable-plugin \
     --enable-linker-build-id \
     --enable-decimal-float=no \
--

why do we want to disable it ? In anycase perhaps make it a packageconfig for consistency and I would
think we should enable it by default.

Quoted 5 lines

2.7.4