Update fossil and unionfs-fuse to use pkg-config for libfuse header file

location. This prepares for the pending FUSE header file move from /usr/include
to /use/include/fuse.

OK bket@ for unionfs-fuse
OK jturner@ for fossil
This commit is contained in:
helg
2025-11-23 18:13:23 +00:00
parent 44c7cdefdd
commit 66021cd65c
2 changed files with 12 additions and 1 deletions
+10
View File
@@ -10,3 +10,13 @@ Index: auto.def
msg-result "Trying to link statically"
} else {
define-append EXTRA_CFLAGS -DFOSSIL_DYNAMIC_BUILD=1
@@ -814,7 +814,8 @@ if {[opt-bool fusefs]} {
if {[opt-bool static]} {
msg-result "FuseFS support disabled due to -static"
} elseif {[cc-check-function-in-lib fuse_mount fuse]} {
- define-append EXTRA_CFLAGS -DFOSSIL_HAVE_FUSEFS
+ set cflags [exec pkg-config fuse --cflags-only-I]
+ define-append EXTRA_CFLAGS -DFOSSIL_HAVE_FUSEFS $cflags
define FOSSIL_HAVE_FUSEFS 1
msg-result "FuseFS support enabled"
}
+2 -1
View File
@@ -11,7 +11,8 @@ PERMIT_PACKAGE = Yes
WANTLIB = c fuse pthread
MAKE_FLAGS = CPPFLAGS="-DFUSE_USE_VERSION=29 -DDISABLE_XATTR" \
MAKE_FLAGS = CPPFLAGS="-DFUSE_USE_VERSION=29 -DDISABLE_XATTR \
`pkg-config --cflags fuse`" \
LIB="-lfuse -lpthread"
ALL_TARGET = build