From 1653e4258711bd9b9c7b4a1ff17f16ba8cdf711e Mon Sep 17 00:00:00 2001 From: Howard Holm Date: Sun, 3 Sep 2023 13:07:22 +0100 Subject: [PATCH] net/jose: unbreak with openssl3 PR: 271192 Reported by: ngie Author: Howard Holm (maintainer) --- net/jose/Makefile | 5 ++--- net/jose/files/patch-meson.build | 14 +++----------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/net/jose/Makefile b/net/jose/Makefile index 0bc90d72a8603..93c577d842af7 100644 --- a/net/jose/Makefile +++ b/net/jose/Makefile @@ -9,12 +9,11 @@ WWW= https://github.com/latchset/jose LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= a2x:textproc/asciidoc +BUILD_DEPENDS= a2x:textproc/asciidoc \ + jq:textproc/jq LIB_DEPENDS= libjansson.so:devel/jansson USES= compiler:c11 meson ninja pkgconfig ssl -BROKEN_SSL= openssl30 openssl31 -BROKEN_SSL_REASON= Fails to build with lots of ld: error: undefined symbol: EVP_CIPHER_* USE_GITHUB= yes GH_ACCOUNT= latchset GH_TAGNAME= v11 diff --git a/net/jose/files/patch-meson.build b/net/jose/files/patch-meson.build index 43486875c3a01..052b892890a93 100644 --- a/net/jose/files/patch-meson.build +++ b/net/jose/files/patch-meson.build @@ -1,20 +1,12 @@ --- meson.build.orig 2021-05-07 13:04:06 UTC +++ meson.build -@@ -38,7 +38,7 @@ add_project_arguments( - zlib = dependency('zlib') - threads = dependency('threads') - jansson = dependency('jansson', version: '>=2.10') --libcrypto = dependency('libcrypto', version: '>=1.0.2') -+libcrypto = meson.get_compiler('c').find_library('crypto', dirs: [ '/usr/lib/' ]) - a2x = find_program('a2x', required: false) - - mans = [] @@ -60,7 +60,7 @@ pkg.generate( filebase: meson.project_name(), name: 'José Library', - requires_private: [ 'zlib', 'libcrypto' ], -+ requires_private: [ 'zlib' ], ++ libraries_private: [ zlib, libcrypto ], libraries: libjose, - requires: 'jansson', +- requires: 'jansson', ++ requires: jansson, )