From patchwork Sat Jul 25 16:54:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1336289 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.133; helo=hemlock.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=l9eOQGXW; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BDXJ44b7Cz9sPf for ; Sun, 26 Jul 2020 02:55:31 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 48A8588AC5; Sat, 25 Jul 2020 16:55:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nE1wneeuxHUf; Sat, 25 Jul 2020 16:55:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id E41EE88AA9; Sat, 25 Jul 2020 16:55:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 292891BF303 for ; Sat, 25 Jul 2020 16:55:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 25E4988AA9 for ; Sat, 25 Jul 2020 16:55:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id m5v7b6y6-gIT for ; Sat, 25 Jul 2020 16:55:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by hemlock.osuosl.org (Postfix) with ESMTPS id 1849088A71 for ; Sat, 25 Jul 2020 16:55:22 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id r12so10928345wrj.13 for ; Sat, 25 Jul 2020 09:55:22 -0700 (PDT) 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=oduJpXzi5iNzasZ2/sH2EiAfmPB0exezuQEfwBNDxRs=; b=l9eOQGXWqArSUtO6s5T44roPWkUiOE1s/DrhpIfdPhj8JUCqg9TAHlG5zABlllNuu3 xU3nHE9BQ9YA5qeahVtDXH3l4JCFhtCJr/zwsWpL2SspAYEbYZtlz/+w53GNCciXotWb VHt6+xUwpVriZYjc/UDYAMTF5p9fodqyYFvE8uQT16Ralk5TnbfFs8ArHgk1juYqe9ta E73ke+94kC1k6B3SVMVPo+jj32r6aDcGs0rFZsvktKRAtv/AKq+lwqr+7RoGfKSMOXOn 97juyVN6dW/+bgeGrWSrZBbt+zMzqsXBxvZqM16OvZpLmgo2a/dArB6sZNLbwPyaWG6R zSoA== 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=oduJpXzi5iNzasZ2/sH2EiAfmPB0exezuQEfwBNDxRs=; b=Sk6TicrBLD9FrAXY4qeXxdpjnkbiMqVHzg41Tdh/Pb25BzhrWAnx1wtnspl7B6J2TF jZfFLEImMglybtgh1zENl2SEu3ej0VEphhEH955D5CQ1S0WAD/zzpeChpFe3eQZXOOTi IeqonbEdc/WN0izoJ1DTPDVelKWPNMWPaYH1os1cqBsLzchKFey/sJw2hvboRWHYgpeD 0DsmdJ4M7WaNrJkM37ZrtcQAptdxoTTK0mWtqIBWQdpVuIjf5PuTOVtrvur0F0VOyIW+ VQE304lY+gWvvOUZVG4n3R1aMOzYhkGFEZgJjIZkUV+Xj9MknxAcZG8BnhlLSSVoHFmU iHPw== X-Gm-Message-State: AOAM532zu5wqzoue4vaT674aqSVvG3SJF3OcjJtwFWhhUXFZhLtvb01d DomR6aZquwA38BJObCNZNh2SATmi X-Google-Smtp-Source: ABdhPJwd/CRLO8Cm/qPEAsBc+x+AY5zX3cc/3cBmI1qfPJbm9OdMZ5va3w2vImhTNo6rBZKX9Gbyqw== X-Received: by 2002:a5d:46c7:: with SMTP id g7mr13113538wrs.365.1595696120116; Sat, 25 Jul 2020 09:55:20 -0700 (PDT) Received: from kali.home (lfbn-ren-1-2132-33.w92-167.abo.wanadoo.fr. [92.167.211.33]) by smtp.gmail.com with ESMTPSA id t2sm12029129wmb.25.2020.07.25.09.55.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Jul 2020 09:55:19 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 25 Jul 2020 18:54:41 +0200 Message-Id: <20200725165441.399163-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2, 1/1] package/gvfs: fix linking with libmetadata 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: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: - http://autobuild.buildroot.org/results/fa892c41b6b9285839a0164b000e37fb04dcc194 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Fix typo: Fiwes -> Fixes ...n.build-fix-linking-with-libmetadata.patch | 78 +++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 package/gvfs/0001-meson.build-fix-linking-with-libmetadata.patch diff --git a/package/gvfs/0001-meson.build-fix-linking-with-libmetadata.patch b/package/gvfs/0001-meson.build-fix-linking-with-libmetadata.patch new file mode 100644 index 0000000000..3ee4a28e94 --- /dev/null +++ b/package/gvfs/0001-meson.build-fix-linking-with-libmetadata.patch @@ -0,0 +1,78 @@ +From 731256d7517f0d9cf0b999bb22f864080d5e8690 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 18 Jul 2020 10:00:50 +0200 +Subject: [PATCH] meson.build: fix linking with libmetadata + +libmetadata is built as a static library and depends on libgvfscommon so +change the dependencies order to put libgvfscommon_dep after +libmetadata_dep or gvfsd-metadata will fail to link on: + +FAILED: metadata/gvfsd-metadata +/home/naourr/work/instance-3/output-1/host/bin/arm-none-linux-gnueabi-gcc -o metadata/gvfsd-metadata 'metadata/45447b7@@gvfsd-metadata@exe/meta-daemon.c.o' -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -Wl,--start-group common/libgvfscommon.so metadata/libmetadata.a /home/naourr/work/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libgio-2.0.so /home/naourr/work/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libgobject-2.0.so /home/naourr/work/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libglib-2.0.so -Wl,--end-group '-Wl,-rpath,$ORIGIN/../common:$ORIGIN/' -Wl,-rpath-link,/home/naourr/work/instance-3/output-1/build/gvfs-1.44.1/build/common -Wl,-rpath-link,/home/naourr/work/instance-3/output-1/build/gvfs-1.44.1/build/metadata +metadata/libmetadata.a(metatree.c.o): In function `safe_open': +metatree.c:(.text+0x9c8): undefined reference to `gvfs_randomize_string' +collect2: error: ld returned 1 exit status + +Apply this change in the whole source code and not only for +gvfsd-metadata to avoid any other build failures. + +Fixes: + - http://autobuild.buildroot.org/results//fa892c41b6b9285839a0164b000e37fb04dcc194 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.gnome.org/GNOME/gvfs/-/merge_requests/92] +--- + client/meson.build | 2 +- + metadata/meson.build | 5 +++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/client/meson.build b/client/meson.build +index 8f57d0d3..1d251481 100644 +--- a/client/meson.build ++++ b/client/meson.build +@@ -33,8 +33,8 @@ sources = uri_parser_sources + uri_utils + files( + + deps = [ + gio_unix_dep, +- libgvfscommon_dep, + libmetadata_dep, ++ libgvfscommon_dep, + ] + + cflags = [ +diff --git a/metadata/meson.build b/metadata/meson.build +index 4e120d18..5699e6f2 100644 +--- a/metadata/meson.build ++++ b/metadata/meson.build +@@ -72,8 +72,8 @@ libmetadata_dep = declare_dependency( + ) + + deps = [ +- libgvfscommon_dep, + libmetadata_dep, ++ libgvfscommon_dep, + ] + + if enable_gudev +@@ -105,8 +105,8 @@ if enable_devel_utils + app + '.c', + include_directories: top_inc, + dependencies: [ +- libgvfscommon_dep, + libmetadata_dep, ++ libgvfscommon_dep, + ], + c_args: cflags, + ) +@@ -119,6 +119,7 @@ if enable_devel_utils + include_directories: top_inc, + dependencies: [ + libmetadata_dep, ++ libgvfscommon_dep, + libxml_dep, + ], + c_args: cflags, +-- +2.27.0 +