From 5b2f86cd08212f0ed783e8064d334ef21c6645e0 Mon Sep 17 00:00:00 2001
From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Mon, 4 Nov 2024 18:40:51 +0000
Subject: [PATCH] meson: default enable compression and openssl

The default for the compressions and openssl is based on the autotools
build ones. With the initial goal to make migration as easy as possible
- identical option names, help messages, defaults...

Although a bunch of these have changed already, plus we want builders to
get support for compressed/signed modules out of the box.

So let's flip the defaults - everyone is welcome to adjust those when
calling `meson setup -D foo=bar`.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/225
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
---
 .github/workflows/main.yml |  4 +++-
 meson_options.txt          | 16 ++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index febd86cf..a4297b05 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -113,7 +113,9 @@ jobs:
 
       - name: configure (32bit) (meson)
         if: ${{ matrix.build == 'meson' && matrix.container.multilib == 'true' }}
-        run: mkdir build32 && cd build32 && CC="$CC -m32" meson setup . ..
+        run: |
+          cross_options="-D zstd=disabled -D xz=disabled -D zlib=disabled -D openssl=disabled"
+          CC="$CC -m32" meson setup $cross_options build32/
 
       - name: build (32bit) (meson)
         if: ${{ matrix.build == 'meson' && matrix.container.multilib == 'true' }}
diff --git a/meson_options.txt b/meson_options.txt
index 4a25fb0e..816b0c64 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -34,30 +34,30 @@ option(
 option(
   'zstd',
   type : 'feature',
-  value : 'disabled',
-  description : 'Handle Zstandard-compressed modulesi. Default: disabled',
+  value : 'enabled',
+  description : 'Handle Zstandard-compressed modulesi. Default: enabled',
 )
 
 option(
   'xz',
   type : 'feature',
-  value : 'disabled',
-  description : 'Handle Xz-compressed modules. Default: disabled',
+  value : 'enabled',
+  description : 'Handle Xz-compressed modules. Default: enabled',
 )
 
 option(
   'zlib',
   type : 'feature',
-  value : 'disabled',
-  description : 'Handle gzip-compressed modules. Default: disabled',
+  value : 'enabled',
+  description : 'Handle gzip-compressed modules. Default: enabled',
 )
 
 # Signed modules
 option(
   'openssl',
   type : 'feature',
-  value : 'disabled',
-  description : 'Openssl support, PKCS7 signatures. Default: disabled',
+  value : 'enabled',
+  description : 'Openssl support, PKCS7 signatures. Default: enabled',
 )
 
 option(
-- 
2.47.2