0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch 3.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041
  1. From 8622d37587169c1e4a4206a9462868ede057f0e8 Mon Sep 17 00:00:00 2001
  2. From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  3. Date: Sat, 15 Feb 2020 15:13:59 +0100
  4. Subject: [PATCH] mesonbuild/dependencies/base.py: add pkg_config_static
  5. Allow the user to always call pkg-config with --static thanks to a
  6. pkg_config_static property. This will allow to fix static build failures
  7. with libglib2:
  8. FAILED: gio/gio
  9. /home/naourr/work/instance-0/output-1/host/bin/arm-linux-gcc -o gio/gio 'gio/6ae6c9e@@gio@exe/gio-tool.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-cat.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-copy.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-info.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-list.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-mime.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-mkdir.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-monitor.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-mount.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-move.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-open.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-rename.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-remove.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-save.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-set.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-trash.c.o' 'gio/6ae6c9e@@gio@exe/gio-tool-tree.c.o' -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -static -Wl,--start-group gio/libgio-2.0.a glib/libglib-2.0.a gobject/libgobject-2.0.a gmodule/libgmodule-2.0.a -pthread /home/naourr/work/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libz.a /home/naourr/work/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libmount.a /home/naourr/work/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libpcre.a -lm /home/naourr/work/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libffi.a -Wl,--end-group '-Wl,-rpath,$ORIGIN/:$ORIGIN/../glib:$ORIGIN/../gobject:$ORIGIN/../gmodule' -Wl,-rpath-link,/home/naourr/work/instance-0/output-1/build/libglib2-2.62.4/build/gio -Wl,-rpath-link,/home/naourr/work/instance-0/output-1/build/libglib2-2.62.4/build/glib -Wl,-rpath-link,/home/naourr/work/instance-0/output-1/build/libglib2-2.62.4/build/gobject -Wl,-rpath-link,/home/naourr/work/instance-0/output-1/build/libglib2-2.62.4/build/gmodule
  10. /home/naourr/work/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/naourr/work/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libmount.a(la-fs.o): in function `__mnt_fs_set_source_ptr':
  11. fs.c:(.text+0x5ec): undefined reference to `blkid_parse_tag_string'
  12. Fixes:
  13. - http://autobuild.buildroot.org/results/0d36952def63cb69628697fa6408aeb6ce10cb5b
  14. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  15. [Romain: Fix if condition, pkg_config_static is a string not a boolean]
  16. Signed-off-by: Romain Naour <romain.naour@gmail.com>
  17. ---
  18. mesonbuild/dependencies/base.py | 3 ++-
  19. 1 file changed, 2 insertions(+), 1 deletion(-)
  20. diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
  21. index 23701da95..83e51626d 100644
  22. --- a/mesonbuild/dependencies/base.py
  23. +++ b/mesonbuild/dependencies/base.py
  24. @@ -849,7 +849,8 @@ class PkgConfigDependency(ExternalDependency):
  25. def _set_libs(self):
  26. env = None
  27. libcmd = [self.name, '--libs']
  28. - if self.static:
  29. + if self.static or \
  30. + (self.env.properties[self.for_machine].get('pkg_config_static', None) == 'true'):
  31. libcmd.append('--static')
  32. # Force pkg-config to output -L fields even if they are system
  33. # paths so we can do manual searching with cc.find_library() later.
  34. --
  35. 2.25.1