1From 3d6a2db2270346236dd6247e0648ea0c949ba468 Mon Sep 17 00:00:00 2001
2From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
3Date: Sat, 15 Feb 2020 15:13:59 +0100
4Subject: [PATCH] mesonbuild/dependencies/base.py: add pkg_config_static
5
6Allow the user to always call pkg-config with --static thanks to a
7pkg_config_static property. This will allow to fix static build failures
8with libglib2:
9
10FAILED: gio/gio
11/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
12/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':
13fs.c:(.text+0x5ec): undefined reference to `blkid_parse_tag_string'
14
15Fixes:
16 - http://autobuild.buildroot.org/results/0d36952def63cb69628697fa6408aeb6ce10cb5b
17
18Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
19[Romain: Fix if condition, pkg_config_static is a string not a boolean]
20Signed-off-by: Romain Naour <romain.naour@gmail.com>
21[Rebased on 0.57.1]
22Signed-off-by: Peter Seiderer <ps.report@gmx.net>
23---
24 mesonbuild/dependencies/pkgconfig.py | 3 ++-
25 1 file changed, 2 insertions(+), 1 deletion(-)
26
27diff --git a/mesonbuild/dependencies/pkgconfig.py b/mesonbuild/dependencies/pkgconfig.py
28index 1e8d9132e..d902ba215 100644
29--- a/mesonbuild/dependencies/pkgconfig.py
30+++ b/mesonbuild/dependencies/pkgconfig.py
31@@ -338,7 +338,8 @@ class PkgConfigDependency(ExternalDependency):
32         env = None
33         libcmd = ['--libs']
34
35-        if self.static:
36+        if self.static or \
37+            (self.env.properties[self.for_machine].get('pkg_config_static', None) == 'true'):
38             libcmd.append('--static')
39
40         libcmd.append(self.name)
41--
422.25.1
43
44