0001-Prefer-ext-static-libs-when-default-library-static.patch 1.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445
  1. From ea85465e608178080c3b4d51af9765a8c7c0dae3 Mon Sep 17 00:00:00 2001
  2. From: Matt Weber <matthew.weber@rockwellcollins.com>
  3. Date: Sat, 26 Oct 2019 09:17:29 -0500
  4. Subject: [PATCH] Prefer ext static libs when --default-library=static
  5. This patch adds a case in the library pattern logic to prefer static
  6. libraries when the Meson Core option for "default_library" is set to
  7. solely static.
  8. The existing library search order makes sense for cases of shared and
  9. shared / static mixed. However if using a prebuilt cross-toolchain,
  10. they usually provide both a static and shared version of sysroot
  11. libraries. This presents a problem in a complete static build where
  12. there won't be shared libraries at runtime and during build time there
  13. are failures like "ld: attempted static link of dynamic object".
  14. Bug:
  15. https://github.com/mesonbuild/meson/issues/6108
  16. Fixes:
  17. http://autobuild.buildroot.net/results/db1740b4777f436324218c52bc7b08e5c21b667d/
  18. http://autobuild.buildroot.net/results/c17/c17bbb12d9deadd64a441b36e324cfbbe8aba5be/
  19. Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
  20. ---
  21. mesonbuild/compilers/mixins/clike.py | 3 +++
  22. 1 file changed, 3 insertions(+)
  23. diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py
  24. index 47e97d261..729c98acc 100644
  25. --- a/mesonbuild/compilers/mixins/clike.py
  26. +++ b/mesonbuild/compilers/mixins/clike.py
  27. @@ -940,6 +940,9 @@ class CLikeCompiler:
  28. elif env.machines[self.for_machine].is_cygwin():
  29. shlibext = ['dll', 'dll.a']
  30. prefixes = ['cyg'] + prefixes
  31. + elif env.coredata.get_builtin_option('default_library') == 'static':
  32. + # Linux/BSDs
  33. + shlibext = ['a']
  34. else:
  35. # Linux/BSDs
  36. shlibext = ['so']
  37. --
  38. 2.25.1