fuse3: update to 3.15.0.

This commit is contained in:
triallax 2023-06-14 18:26:15 +01:00 committed by Duncan Overbruck
parent 0e185c4404
commit 55158335ab
2 changed files with 42 additions and 3 deletions

View File

@ -0,0 +1,38 @@
From 6d21930baa4379023414706ce1750e0d729b99f0 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Mon, 12 Jun 2023 12:15:35 +0000
Subject: [PATCH] Wrapper around test applications for cross compiler
environment in meson.build
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.
---
https://github.com/libfuse/libfuse/pull/804
meson.build | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/meson.build b/meson.build
index 7aa4e0d47..9707ea3e2 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)

View File

@ -1,9 +1,10 @@
# Template file for 'fuse3'
pkgname=fuse3
version=3.14.1
version=3.15.0
revision=1
build_style=meson
configure_args="--sbindir=bin -Db_lto=false -Dexamples=false -Duseroot=false"
configure_args="--sbindir=bin -Db_lto=false -Dexamples=false -Duseroot=false
-Dtests=false"
hostmakedepends="pkg-config"
makedepends="eudev-libudev-devel"
short_desc="Filesystem in Userspace 3.x"
@ -12,7 +13,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://github.com/libfuse/libfuse"
changelog="https://raw.githubusercontent.com/libfuse/libfuse/master/ChangeLog.rst"
distfiles="https://github.com/libfuse/libfuse/releases/download/fuse-${version}/fuse-${version}.tar.xz"
checksum=126919d72b46b3e0eb58a9c6933a2a50c36f2ea69f61fe9e78bdba9f463ffa20
checksum=70589cfd5e1cff7ccd6ac91c86c01be340b227285c5e200baa284e401eea2ca0
conf_files="/etc/fuse.conf"
# Tests require root
make_check=no