0002-allow-explicit-disabling-of-tests.patch 1.4 KB

12345678910111213141516171819202122232425262728293031323334353637
  1. From cdccbc6ec36243463613cb32d7058c26c3c51e16 Mon Sep 17 00:00:00 2001
  2. From: Adam Duskett <Aduskett@gmail.com>
  3. Date: Wed, 18 Sep 2019 09:50:00 -0700
  4. Subject: [PATCH] allow explicit disabling of tests
  5. Upstream won't build tests when cross-compiling. However; this means still
  6. building the tests during a host build. Building the tests causes build
  7. failures on older distributions such as CentOS 6 and Debian 7 because the
  8. command `objcopy --add-symbol` is used when building the test
  9. "test_resources2," which is not available with the older version of objcopy
  10. provided by the distributions.
  11. Instead, remove the conditional checks which set build_tests and only check if
  12. installed_tests_enabled is passed.
  13. Signed-off-by: Adam Duskett <Aduskett@gmail.com>
  14. Refresh for 2.62.2
  15. ---
  16. meson.build | 2 +-
  17. 1 file changed, 1 insertion(+), 1 deletion(-)
  18. diff --git a/meson.build b/meson.build
  19. index 99806d0..3206603 100644
  20. --- a/meson.build
  21. +++ b/meson.build
  22. @@ -84,7 +84,7 @@ installed_tests_template = files('template.test.in')
  23. installed_tests_template_tap = files('template-tap.test.in')
  24. # Don’t build the tests unless we can run them (either natively, in an exe wrapper, or by installing them for later use)
  25. -build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper()) or installed_tests_enabled
  26. +build_tests = installed_tests_enabled
  27. add_project_arguments('-D_GNU_SOURCE', language: 'c')
  28. --
  29. 2.23.0