mirror of
https://github.com/openwrt/packages.git
synced 2025-12-22 01:44:32 +04:00
f24c97fff8
GNUnet 0.25 dropped the autotools based build system and now requires being built with Meson. As expected there are some cross-compiling related issues which have been fixed using downstream patches by now. v0.25.1: - transport: hotfix incorrect communicator key derivations - tests: make failing tests work again - util: Change to assigned HPKE codepoint for DHKEM+Elligator. See https://www.iana.org/assignments/hpke/ - fs: service failed to start because of PILS addition v0.25.0: - util: Removed authkem from HPKE implementation as it is going to be removed from the RFC9180bis spec and is unused in GNUnet anyway. - core: New AKE implementation. - pils: New service. - gns: Various improvements to performance and DNS migration tooling. - build: Retired autotools. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From 8ed32eb1d705ee1838ac1da81ca8f1f821493c94 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Fri, 10 Oct 2025 00:53:51 +0100
|
|
Subject: [PATCH 3/8] meson: convert libsodium version detection to
|
|
compile-time test
|
|
|
|
Use compile-time test instead of relying on testing the libsodium version
|
|
at runtime. This is done to make cross-compilation possible again.
|
|
---
|
|
meson.build | 13 ++++++++-----
|
|
1 file changed, 8 insertions(+), 5 deletions(-)
|
|
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -244,16 +244,19 @@ if not sodium_dep.found()
|
|
sodium_dep = cc.find_library('sodium', required: true)
|
|
sodium_version_check = '''#include <sodium.h>
|
|
int main(int argc, char **argv) {
|
|
- return ((SODIUM_LIBRARY_VERSION_MAJOR > 10) ||
|
|
- ((SODIUM_LIBRARY_VERSION_MAJOR == 10) &&
|
|
- (SODIUM_LIBRARY_VERSION_MINOR >= 3))) ? 0 : 1;
|
|
+ #if !((SODIUM_LIBRARY_VERSION_MAJOR > 10) || \
|
|
+ ((SODIUM_LIBRARY_VERSION_MAJOR == 10) && \
|
|
+ (SODIUM_LIBRARY_VERSION_MINOR >= 3)))
|
|
+ #error "libsodium version >= 1.0.18 required"
|
|
+ #endif
|
|
+ return 0
|
|
}
|
|
'''
|
|
- if cc.run(
|
|
+ if not cc.compiles(
|
|
sodium_version_check,
|
|
name: 'sodium version check',
|
|
dependencies: sodium_dep,
|
|
- ).returncode() != 0
|
|
+ )
|
|
error('libsodium version >=1.0.18 required')
|
|
endif
|
|
endif
|