From patchwork Sat Jul 25 17:12: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: 1336296 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.137; helo=fraxinus.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=alytR9KO; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BDXhD5FSsz9sRR for ; Sun, 26 Jul 2020 03:13:00 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4CDE386559; Sat, 25 Jul 2020 17:12:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Y9Im_t8MYFuK; Sat, 25 Jul 2020 17:12:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id A20E086599; Sat, 25 Jul 2020 17:12:57 +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 3BDE51BF5DC for ; Sat, 25 Jul 2020 17:12:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3464E87F84 for ; Sat, 25 Jul 2020 17:12:57 +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 h6D5vBZjltGG for ; Sat, 25 Jul 2020 17:12:56 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 2EA5087E13 for ; Sat, 25 Jul 2020 17:12:56 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id k8so534025wma.2 for ; Sat, 25 Jul 2020 10:12:56 -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=xVjMa9zoxTv7ygskvPHK3GDFlTzauG7ojkves9ixJYs=; b=alytR9KObZ7MKc21mJ8KcCh9pSsLRBZ2r3HOjmA3YPsI3yI6Y8wrhxJtT5UakPy1B+ xvJR5YirgqjC4aj1KVuvSdgm/Pbdr4vqrnq21OrtREhv75hFFV/FenuFIPQvT9JDdWEX jREj/NyuAlg2m/Sp4FiBaLzL83U3xo5kAssdPVS8M4tRTuG2hJKfsOUEunEr0vSoKrcV u25xbmARAnjlBsbXkPDM92Hh1AD2XXsEla/ZER6ao/aY1yP60LojmZ8HXlOWskBdvpqT MDC7244vb5oF8sgysJKngyTV2KSmDnbnY05q6lfnjNZbyIbwtCO4uOM6maZM2J05zBSJ a4dQ== 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=xVjMa9zoxTv7ygskvPHK3GDFlTzauG7ojkves9ixJYs=; b=cqcAhmYpQVZnDs+2xXMOTyTiR8qeQfg9ssUwwP2Ij98UStKurwlo48TXxKQeP5k/Am 3sz4I14roJhzpSmdTTSeqgFPVuEeNP4dtIW9mjOy4FsZ5fFGUEsShUSxgntbRkb4P0pd xP0ylAjP97S2CcvogtJBn55qLHK5039XdDZv74nFnoTS0gHefi1Rumvp5GG44GT3KQkf +uA6DCCRGfaUvEBpNXQ9dhbVMFb7DsG3M0lqC9AMznsJPYJam7BTHb+WovKg7VQcQeXU eeVCjaOGAINIKTsvm26j/srp+9b68sTU+bYRHLerNvA4MOA8OSUbRYIk7H68sURkQKC5 j+KQ== X-Gm-Message-State: AOAM5326zWPX9uoa1jlZX2moBzdpoAELtFP4zbEUzF+L/gnzJHXFFpT9 zgY81aezuL7S+GS3HCB7wCOBeM92 X-Google-Smtp-Source: ABdhPJxS6Gblt7zqytBytlPseYLXiAYVT1XBY3+KjHyM3MJyeHlRf67lPQojNpe+8lNO1VvUQMj3Qw== X-Received: by 2002:a1c:2bc5:: with SMTP id r188mr13125491wmr.18.1595697174225; Sat, 25 Jul 2020 10:12:54 -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 14sm10998626wmk.19.2020.07.25.10.12.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Jul 2020 10:12:53 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 25 Jul 2020 19:12:41 +0200 Message-Id: <20200725171241.470533-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/libfuse3: define fuse_session_loop_mt as a macro on uclibc 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 , Asaf Kahlon Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This will fix a build failure with fuse-overlayfs Fixes: - http://autobuild.buildroot.org/results/7186515526ee60488dac3bf9c4580ffd13a0ceac Signed-off-by: Fabrice Fontaine --- ...op_mt-as-a-macro-on-uclibc-and-MacOS.patch | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 package/libfuse3/0001-Define-fuse_session_loop_mt-as-a-macro-on-uclibc-and-MacOS.patch diff --git a/package/libfuse3/0001-Define-fuse_session_loop_mt-as-a-macro-on-uclibc-and-MacOS.patch b/package/libfuse3/0001-Define-fuse_session_loop_mt-as-a-macro-on-uclibc-and-MacOS.patch new file mode 100644 index 0000000000..53f31bc071 --- /dev/null +++ b/package/libfuse3/0001-Define-fuse_session_loop_mt-as-a-macro-on-uclibc-and-MacOS.patch @@ -0,0 +1,63 @@ +From c27a9172af352ab36aeeb425fb1ab86888368961 Mon Sep 17 00:00:00 2001 +From: Asaf Kahlon +Date: Sat, 11 Jul 2020 12:51:17 +0300 +Subject: [PATCH] Define fuse_session_loop_mt as a macro on uclibc and MacOS + +On uclibc and MacOS we don't use versioned symbols. Hence, +there's no definition for fuse_session_loop_mt on those cases +and the linker won't be able to resolve calls to fuse_session_loop_mt() + +Signed-off-by: Asaf Kahlon +[Retrieved from: https://github.com/libfuse/libfuse/pull/532] +Signed-off-by: Fabrice Fontaine +--- + include/fuse_lowlevel.h | 9 +++++++-- + lib/fuse_versionscript | 1 + + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/include/fuse_lowlevel.h b/include/fuse_lowlevel.h +index e2b4617b..57995547 100644 +--- a/include/fuse_lowlevel.h ++++ b/include/fuse_lowlevel.h +@@ -471,7 +471,7 @@ struct fuse_lowlevel_ops { + * - When writeback caching is disabled, the filesystem is + * expected to properly handle the O_APPEND flag and ensure + * that each write is appending to the end of the file. +- * ++ * + * - When writeback caching is enabled, the kernel will + * handle O_APPEND. However, unless all changes to the file + * come through the kernel this will not work reliably. The +@@ -1975,14 +1975,19 @@ int fuse_session_loop(struct fuse_session *se); + * fuse_session_loop(). + * + * @param se the session +- * @param config session loop configuration ++ * @param config session loop configuration + * @return see fuse_session_loop() + */ + #if FUSE_USE_VERSION < 32 + int fuse_session_loop_mt_31(struct fuse_session *se, int clone_fd); + #define fuse_session_loop_mt(se, clone_fd) fuse_session_loop_mt_31(se, clone_fd) + #else ++#if (!defined(__UCLIBC__) && !defined(__APPLE__)) + int fuse_session_loop_mt(struct fuse_session *se, struct fuse_loop_config *config); ++#else ++int fuse_session_loop_mt_32(struct fuse_session *se, struct fuse_loop_config *config); ++#define fuse_session_loop_mt(se, config) fuse_session_loop_mt_32(se, config) ++#endif + #endif + + /** +diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript +index 235abf41..95ea149c 100644 +--- a/lib/fuse_versionscript ++++ b/lib/fuse_versionscript +@@ -146,6 +146,7 @@ FUSE_3.2 { + global: + fuse_session_loop_mt; + fuse_session_loop_mt_31; ++ fuse_session_loop_mt_32; + fuse_loop_mt; + fuse_loop_mt_31; + } FUSE_3.1;