From patchwork Sat Feb 15 15:26:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1238548 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=IrnP49/5; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48KYwS3G02z9s29 for ; Sun, 16 Feb 2020 02:25:28 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A401C203EB; Sat, 15 Feb 2020 15:25:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id icfmZhL3UTsy; Sat, 15 Feb 2020 15:25:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 60BC020335; Sat, 15 Feb 2020 15:25:22 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id BD4BC1BF20F for ; Sat, 15 Feb 2020 15:25:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BA89E8696A for ; Sat, 15 Feb 2020 15:25:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NqfKODveDA5m for ; Sat, 15 Feb 2020 15:25:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by whitealder.osuosl.org (Postfix) with ESMTPS id 86D1286919 for ; Sat, 15 Feb 2020 15:25:20 +0000 (UTC) Received: by mail-wm1-f42.google.com with SMTP id a9so14015003wmj.3 for ; Sat, 15 Feb 2020 07:25:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=TYGXbg+uWwsL1WhYgBk43BB5/JPzEiDAHpWjNDLQPQE=; b=IrnP49/5R+1rwNaS6HiWcrsvRhuxYGS0tMZMJuvg1UC5hG33Orp2g0O4P3QSV269gT 5MyOQfH7F1j82WmwmSk3yROaAniIa740/7p1vAXLRfGR5lBAer/ELU16DqlsobKVYvV1 DCIaNWC0q84FPZEaqaQ0lmTa8a7f9C3CfMd/2rw7l6BLL150iOJSJpqm1LhyaOJLZE3m Ux03t9nUkgiMSxGW32XQiFbCE778k2P1j63fkQIxYCPGIkKqCoV7xxwLlPvtfzGRCeTk bvkqVdbKX/v0FjpeWkxoqtRqgFGvemXbHJCEaDvx/0kvWkZdHVdYb2NyUudU6LD7/cEz h56g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=TYGXbg+uWwsL1WhYgBk43BB5/JPzEiDAHpWjNDLQPQE=; b=rtdK3y3wftWH2Mk36yMZGg6HmorVx2+R1JGWE9j2oBerQMC2/kjmEMXVL1xvbxMNEj ogKaBRnkMptZz1l5BUd1gKIG8h26jD2rOp2Y+2oZJxYYjOynpaA3Xxmq2RhEZ9zPvg+r 06a6aFWB8xNwrY2YeE2xScpOgdq4Jt70T464gidY5wBs11gAJOB5CmYpQlV/73AJtheT mYmPlU9vfIMrDzRELs3Ac6C30jgvkIB6gfcV1P5J3x5/Auyq3lBkmj/cRIXKAA87FUIE PxavPG6+4/PKp0b6OhQ2cdp4fMPwwsZQnVA9UZd/RnK+sKI+AC1nJONLGBtNw/XrX91n HuOA== X-Gm-Message-State: APjAAAXTrMXADTKq2fQE94g71xmQHB2mlBj2w1EQRACuzdfXDlNr5RXy sRSU1zNnOCJWEMn3Cb44EL/a6qk7B1k= X-Google-Smtp-Source: APXvYqz425UXgigdjlF+ibULnQFSWD+qpNUmnW7X55S54QEsZPzVcYpHpRLHr1xW/Cmrt2uc1HHsfQ== X-Received: by 2002:a1c:6389:: with SMTP id x131mr11087940wmb.174.1581780318344; Sat, 15 Feb 2020 07:25:18 -0800 (PST) Received: from kali.home (lfbn-ren-1-602-70.w81-53.abo.wanadoo.fr. [81.53.179.70]) by smtp.gmail.com with ESMTPSA id b16sm11577115wmj.39.2020.02.15.07.25.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Feb 2020 07:25:17 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 15 Feb 2020 16:26:20 +0100 Message-Id: <20200215152620.3553021-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/meson: fix pkg-config --static X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Le Bihan , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" pkg-config wrapper is not used since commit 4e0bc29993376613d200e892d491e31ea5a49622, this raise static build failures with libglib2 because --static is not passed anymore to pkg-config so add a patch to get back the old behaviour. Fixes: - http://autobuild.buildroot.org/results/0d36952def63cb69628697fa6408aeb6ce10cb5b Signed-off-by: Fabrice Fontaine --- ...dencies-base.py-add-pkg_config_stati.patch | 38 +++++++++++++++++++ package/meson/cross-compilation.conf.in | 1 + package/pkg-meson.mk | 1 + 3 files changed, 40 insertions(+) create mode 100644 package/meson/0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch diff --git a/package/meson/0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch b/package/meson/0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch new file mode 100644 index 0000000000..7bb00f3fba --- /dev/null +++ b/package/meson/0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch @@ -0,0 +1,38 @@ +From 3a4962ede0d12bac66b38e0843f6e2ea75b03d50 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 15 Feb 2020 15:13:59 +0100 +Subject: [PATCH] mesonbuild/dependencies/base.py: add pkg_config_static + +Allow the user to always call pkg-config with --static thanks to a +pkg_config_static property. This will allow to fix static build failures +with libglib2: + +FAILED: gio/gio +/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-build root-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 +/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': +fs.c:(.text+0x5ec): undefined reference to `blkid_parse_tag_string' + +Fixes: + - http://autobuild.buildroot.org/results/0d36952def63cb69628697fa6408aeb6ce10cb5b + +Signed-off-by: Fabrice Fontaine +--- + mesonbuild/dependencies/base.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py +index a83e3d6c..913bff6b 100644 +--- a/mesonbuild/dependencies/base.py ++++ b/mesonbuild/dependencies/base.py +@@ -840,7 +840,7 @@ class PkgConfigDependency(ExternalDependency): + def _set_libs(self): + env = None + libcmd = [self.name, '--libs'] +- if self.static: ++ if self.static or self.env.properties[self.for_machine].get('pkg_config_static', False): + libcmd.append('--static') + # Force pkg-config to output -L fields even if they are system + # paths so we can do manual searching with cc.find_library() later. +-- +2.24.1 + diff --git a/package/meson/cross-compilation.conf.in b/package/meson/cross-compilation.conf.in index 369e225b3e..d80c472de6 100644 --- a/package/meson/cross-compilation.conf.in +++ b/package/meson/cross-compilation.conf.in @@ -18,6 +18,7 @@ cpp_args = [@TARGET_CXXFLAGS@] cpp_link_args = [@TARGET_LDFLAGS@] sys_root = '@STAGING_DIR@' pkg_config_libdir = '@STAGING_DIR@/usr/lib/pkgconfig:@STAGING_DIR@/usr/share/pkgconfig' +pkg_config_static = '@STATIC@' [host_machine] system = 'linux' diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index 642b715938..9482845cd3 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -76,6 +76,7 @@ define $(2)_CONFIGURE_CMDS -e 's%@TARGET_CXXFLAGS@%$$(call make-comma-list,$$($(2)_CXXFLAGS))%g' \ -e 's%@HOST_DIR@%$$(HOST_DIR)%g' \ -e 's%@STAGING_DIR@%$$(STAGING_DIR)%g' \ + -e 's%@STATIC@%$$(if $$(BR2_STATIC_LIBS),true,false)%g' \ $$(foreach x,$$($(2)_MESON_EXTRA_BINARIES), \ -e "/^\[binaries\]$$$$/s:$$$$:\n$$(x):" \ ) \