From a6ce0a1be1a42a5cf4136eb0db5ea95168ee73fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Sat, 18 May 2024 15:06:19 +0300
Subject: [PATCH] build/crypto: minor clean up for crypto defines
---
src/apk_crypto.h | 2 ++
src/meson.build | 9 ++-------
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/apk_crypto.h b/src/apk_crypto.h
index 5cae3bfe..eaed4be4 100644
--- a/src/apk_crypto.h
+++ b/src/apk_crypto.h
@@ -17,6 +17,8 @@
#include "apk_crypto_openssl.h"
#elif defined(CRYPTO_USE_MBEDTLS)
#include "apk_crypto_mbedtls.h"
+#else
+#error Crypto backend not selected
#endif
// Digest
diff --git a/src/meson.build b/src/meson.build
index e1204fc0..ec054f6b 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -91,16 +91,11 @@ apk_src = [
]
apk_cargs = [
- '-DAPK_VERSION="' + meson.project_version() + '"',
'-D_ATFILE_SOURCE',
+ '-DAPK_VERSION="' + meson.project_version() + '"',
+ '-DCRYPTO_USE_@0@'.format(crypto_backend.to_upper()),
]
-if crypto_backend == 'openssl'
- apk_cargs += [ '-DCRYPTO_USE_OPENSSL' ]
-elif crypto_backend == 'mbedtls'
- apk_cargs += [ '-DCRYPTO_USE_MBEDTLS' ]
-endif
-
if lua_bin.found()
genhelp_script = files('genhelp.lua')
genhelp_args = [lua_bin, genhelp_script, '@INPUT@']
--
GitLab