From 4cba29946029391a8eced017f65acb6407e0bf23 Mon Sep 17 00:00:00 2001
From: Quentin Boswank <62326551+QBos07@users.noreply.github.com>
Date: Sat, 4 Feb 2023 15:23:40 +0000
Subject: Add zstd to the companion libs

Add zstd to the companion libs witch allows to use lto zstd compression
in a canadian or cross-native enviroment

Signed-off-by: QBos07 <62326551+QBos07@users.noreply.github.com>
Signed-off-by: Quentin Boswank <62326551+QBos07@users.noreply.github.com>
---
 config/cc/gcc.in         | 3 ++-
 config/comp_libs.in      | 9 +++++++++
 config/comp_libs/zstd.in | 1 +
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 config/comp_libs/zstd.in

(limited to 'config')

diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index d5b19c79..37c79efa 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -180,9 +180,10 @@ config CC_GCC_USE_LTO
 config CC_GCC_LTO_ZSTD
     tristate
     prompt "Support LTO compression with zstd"
-    default m if !CANADIAN && !STATIC_TOOLCHAIN
+    default m
     depends on CC_GCC_USE_LTO
     depends on GCC_10_or_later
+    select ZSTD_NEEDED
     help
       Support zstd compression for LTO object files. This will require
       libzstd to be installed when using the toolchain
diff --git a/config/comp_libs.in b/config/comp_libs.in
index 6dd8099e..502e95a3 100644
--- a/config/comp_libs.in
+++ b/config/comp_libs.in
@@ -105,6 +105,11 @@ config ZLIB_NEEDED
     bool "Build local zlib"
     select COMP_LIBS_ZLIB
 
+config ZSTD_NEEDED
+    bool "Build local zstd"
+    default y if CANADIAN || CROSS_NATIVE
+    select COMP_LIBS_ZSTD
+
 # FIXME remove these legacy knobs
 config LIBICONV
     def_bool y
@@ -150,4 +155,8 @@ config ZLIB
     def_bool y
     depends on ZLIB_NEEDED
 
+config ZSTD
+    def_bool y
+    depends on ZSTD_NEEDED
+
 endmenu
diff --git a/config/comp_libs/zstd.in b/config/comp_libs/zstd.in
new file mode 100644
index 00000000..fe7655e0
--- /dev/null
+++ b/config/comp_libs/zstd.in
@@ -0,0 +1 @@
+# Zstd options
-- 
cgit v1.2.3