mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-12-18 16:08:17 +00:00
945b29d741We had an issue reported in #gentoo w/ libsecret's tests failing to build when 0.21.1 is installed and upgrading to 0.21.7. There's two issues here: 1) Tests were being built unconditionally. There's an upstream MR to fix that, so pull it in. (I've added in another patch to control building the Vala tests with that same option). 2) The Vala tests use the system copy of libsecret, which the FreeBSD bug linked below works around with a sed in meson-private. We're not going to do that, so this issue remains unfixed for now, but worked around for most users via 1). Bug: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=287429 Signed-off-by: Sam James <sam@gentoo.org>
11 lines
573 B
Diff
11 lines
573 B
Diff
--- a/libsecret/meson.build
|
|
+++ b/libsecret/meson.build
|
|
@@ -306,7 +306,7 @@ if get_option('introspection')
|
|
# Vala tests
|
|
# FIXME: Don't add Vala tests when generating a coverage build, as this
|
|
# will fail due to https://github.com/mesonbuild/meson/issues/7426
|
|
- if get_option('vapi') and not get_option('b_coverage')
|
|
+ if get_option('vapi') and not get_option('b_coverage') and get_option('test_setup').enabled()
|
|
# FIXME: the "native" kwarg should be added once we can require meson ≥0.54
|
|
add_languages('vala')
|
|
valac = meson.get_compiler('vala')
|