commit: 657b220f0313ff9a1f1ba2a476e71597f4d67202 Author: Florian Schmaus <flow <AT> gentoo <DOT> org> AuthorDate: Thu Aug 17 13:06:35 2023 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Thu Aug 17 13:07:10 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=657b220f
dev-libs/libstrophe: fix tests Closes: https://bugs.gentoo.org/912410 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> ...libstrophe-0.12.3-allow-tests-when-static.patch | 59 ++++++++++++++++++++++ dev-libs/libstrophe/libstrophe-0.12.3.ebuild | 4 ++ 2 files changed, 63 insertions(+) diff --git a/dev-libs/libstrophe/files/libstrophe-0.12.3-allow-tests-when-static.patch b/dev-libs/libstrophe/files/libstrophe-0.12.3-allow-tests-when-static.patch new file mode 100644 index 000000000000..b351bb0137c7 --- /dev/null +++ b/dev-libs/libstrophe/files/libstrophe-0.12.3-allow-tests-when-static.patch @@ -0,0 +1,59 @@ +From 9eba8e873847b6ed6e4aa8e9e887d45c2351f6ed Mon Sep 17 00:00:00 2001 +From: Steffen Jaeckel <[email protected]> +Date: Wed, 9 Aug 2023 13:34:18 +0200 +Subject: [PATCH] Allow running tests when static library is disabled + +We then only run a subset of the tests, but still better than failing to +build. + +Signed-off-by: Steffen Jaeckel <[email protected]> +--- a/Makefile.am ++++ b/Makefile.am +@@ -175,23 +175,29 @@ endif + + + ## Tests +-TESTS = \ ++STATIC_TESTS = \ + tests/check_parser \ ++ tests/test_hash \ ++ tests/test_jid \ ++ tests/test_ctx \ ++ tests/test_send_queue \ ++ tests/test_string \ ++ tests/test_resolver ++ ++TESTS = \ + tests/test_sha1 \ + tests/test_sha256 \ + tests/test_sha512 \ + tests/test_md5 \ + tests/test_rand \ + tests/test_scram \ +- tests/test_ctx \ + tests/test_base64 \ +- tests/test_hash \ +- tests/test_jid \ +- tests/test_send_queue \ + tests/test_snprintf \ +- tests/test_string \ +- tests/test_stanza \ +- tests/test_resolver ++ tests/test_stanza ++ ++if !DISABLE_STATIC ++TESTS += $(STATIC_TESTS) ++endif + + if !DISABLE_TLS + TESTS += tests/test_xmppaddr +--- a/configure.ac ++++ b/configure.ac +@@ -256,6 +256,7 @@ m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], + + AM_CONDITIONAL([PARSER_EXPAT], [test x$with_parser != xlibxml2]) + AM_CONDITIONAL([DISABLE_TLS], [test x$enable_tls = xno]) ++AM_CONDITIONAL([DISABLE_STATIC], [test x$enable_static = xno]) + AM_CONDITIONAL([NEED_SNPRINTF], [test x$have_snprintf = xno]) + AM_CONDITIONAL([TLS_WITH_GNUTLS], [test x$with_gnutls = xyes]) + AM_CONDITIONAL([TLS_WITH_SCHANNEL], [test x$with_schannel = xyes]) diff --git a/dev-libs/libstrophe/libstrophe-0.12.3.ebuild b/dev-libs/libstrophe/libstrophe-0.12.3.ebuild index 84880fd6c622..e1970434de69 100644 --- a/dev-libs/libstrophe/libstrophe-0.12.3.ebuild +++ b/dev-libs/libstrophe/libstrophe-0.12.3.ebuild @@ -30,6 +30,10 @@ BDEPEND=" DOCS=( ChangeLog ) +PATCHES=( + "${FILESDIR}/${PN}-0.12.3-allow-tests-when-static.patch" +) + src_configure() { # shellcheck disable=SC2207 local myeconf=(
