[Buildroot] [PATCH] package/libfuse3: bump to version 3.15.0

* [Buildroot] [PATCH] package/libfuse3: bump to version 3.15.0
@ 2023-06-13 19:09 Giulio Benetti
  2023-06-15  6:51 ` Peter Korsgaard
  0 siblings, 1 reply; 2+ messages in thread
From: Giulio Benetti @ 2023-06-13 19:09 UTC (permalink / raw)
  To: buildroot; +Cc: Giulio Benetti, Asaf Kahlon

Drop local patch that has been upstreamed but add a new one to fix build
failure:
../meson.build:180:12: ERROR: Can not run test applications in this
cross environment.

Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
---
 ...ix-MS_LAZYTIME-not-defined-on-uclibc.patch | 48 -------------------
 ...est-applications-for-cross-compiler-.patch | 43 +++++++++++++++++
 package/libfuse3/libfuse3.hash                |  2 +-
 package/libfuse3/libfuse3.mk                  |  2 +-
 4 files changed, 45 insertions(+), 50 deletions(-)
 delete mode 100644 package/libfuse3/0001-Fix-MS_LAZYTIME-not-defined-on-uclibc.patch
 create mode 100644 package/libfuse3/0001-Wrapper-around-test-applications-for-cross-compiler-.patch

diff --git a/package/libfuse3/0001-Fix-MS_LAZYTIME-not-defined-on-uclibc.patch b/package/libfuse3/0001-Fix-MS_LAZYTIME-not-defined-on-uclibc.patch
deleted file mode 100644
index 58f9747d77..0000000000
--- a/package/libfuse3/0001-Fix-MS_LAZYTIME-not-defined-on-uclibc.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 56038446952516da5d4cf09e1192824031082943 Mon Sep 17 00:00:00 2001
-From: Giulio Benetti <giulio.benetti@benettiengineering.com>
-Date: Mon, 27 Mar 2023 21:08:57 +0200
-Subject: [PATCH] Fix MS_LAZYTIME not defined on uclibc
-
-[Upstream status: https://github.com/libfuse/libfuse/pull/753]
-Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
----
- lib/mount.c       | 5 +++++
- util/fusermount.c | 6 ++++++
- 2 files changed, 11 insertions(+)
-
-diff --git a/lib/mount.c b/lib/mount.c
-index 1f1ee86..84e5c73 100644
---- a/lib/mount.c
-+++ b/lib/mount.c
-@@ -27,6 +27,11 @@
- #include <sys/wait.h>
- #include <sys/mount.h>
- 
-+/* uclibc doesn't define MS_LAZYTIME */
-+#ifndef MS_LAZYTIME
-+#define MS_LAZYTIME	(1<<25)
-+#endif
-+
- #ifdef __NetBSD__
- #include <perfuse.h>
- 
-diff --git a/util/fusermount.c b/util/fusermount.c
-index 6e72f0d..82cc420 100644
---- a/util/fusermount.c
-+++ b/util/fusermount.c
-@@ -25,6 +25,12 @@
- #include <sys/wait.h>
- #include <sys/stat.h>
- #include <sys/mount.h>
-+
-+/* uclibc doesn't define MS_LAZYTIME */
-+#ifndef MS_LAZYTIME
-+#define MS_LAZYTIME	(1<<25)
-+#endif
-+
- #include <sys/fsuid.h>
- #include <sys/socket.h>
- #include <sys/utsname.h>
--- 
-2.34.1
-
diff --git a/package/libfuse3/0001-Wrapper-around-test-applications-for-cross-compiler-.patch b/package/libfuse3/0001-Wrapper-around-test-applications-for-cross-compiler-.patch
new file mode 100644
index 0000000000..b99b4c23f4
--- /dev/null
+++ b/package/libfuse3/0001-Wrapper-around-test-applications-for-cross-compiler-.patch
@@ -0,0 +1,43 @@
+From b58a0014bff619f1810af49441d987d732c4244e Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Tue, 13 Jun 2023 20:02:01 +1000
+Subject: [PATCH] Wrapper around test applications for cross compiler
+ environment in meson.build (#804)
+
+This enhances commit 7be56c57f93e3436b1fbd9ecc320de5c03a3e4b8 to allow build
+fuse to be built using a cross compiler
+
+Fixes:
+../meson.build:180:12: ERROR: Can not run test applications in this cross environment.
+
+Upstream: https://github.com/libfuse/libfuse/commit/b58a0014bff619f1810af49441d987d732c4244e
+
+Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
+---
+ meson.build | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 7aa4e0d..9707ea3 100644
+--- a/meson.build
++++ b/meson.build
+@@ -177,10 +177,12 @@ int main()
+ }
+ '''
+ 
+-result = cc.run(detect_getmntent_needs_unescape)
+-if result.compiled() and result.returncode() == 0 and result.stdout().strip() == 'needs escaping'
+-  message('getmntent does not unescape')
+-  add_project_arguments('-DGETMNTENT_NEEDS_UNESCAPING', language: 'c')
++if not meson.is_cross_build()
++  result = cc.run(detect_getmntent_needs_unescape)
++  if result.compiled() and result.returncode() == 0 and result.stdout().strip() == 'needs escaping'
++    message('getmntent does not unescape')
++    add_project_arguments('-DGETMNTENT_NEEDS_UNESCAPING', language: 'c')
++  endif
+ endif
+ 
+ # Write private test results into fuse_config.h (stored in build directory)
+-- 
+2.34.1
+
diff --git a/package/libfuse3/libfuse3.hash b/package/libfuse3/libfuse3.hash
index df4df524d0..155c29ecd2 100644
--- a/package/libfuse3/libfuse3.hash
+++ b/package/libfuse3/libfuse3.hash
@@ -1,3 +1,3 @@
 # Locally calculated sha256 checksums
-sha256  99688d68a753ee97eed51d536b216b8ae5d7fe0236c1a45d439357903bfd4d88  libfuse3-3.14.1.tar.gz
+sha256  1e79f1dd60eaf79645c21411c4a7028c97b5e745ea677ac5bda747c90497a785  libfuse3-3.15.0.tar.gz
 sha256  b8832d9caaa075bbbd2aef24efa09f8b7ab66a832812d88c602da0c7b4397fad  LICENSE
diff --git a/package/libfuse3/libfuse3.mk b/package/libfuse3/libfuse3.mk
index 61523820ad..f1b294f74f 100644
--- a/package/libfuse3/libfuse3.mk
+++ b/package/libfuse3/libfuse3.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBFUSE3_VERSION = 3.14.1
+LIBFUSE3_VERSION = 3.15.0
 LIBFUSE3_SITE = $(call github,libfuse,libfuse,fuse-$(LIBFUSE3_VERSION))
 LIBFUSE3_LICENSE = LGPL-2.1
 LIBFUSE3_LICENSE_FILES = LICENSE
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread