Wed Jun 23 19:08:10 2021 UTC ()
macFUSE headers have been in /usr/local/include/fuse for a while. Add
that to BUILDLINK_PASSTHRU_DIRS.


(schmonz)
diff -r1.22 -r1.23 pkgsrc/mk/fuse.buildlink3.mk
cvs diff -r1.22 -r1.23 pkgsrc/mk/fuse.buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/mk/fuse.buildlink3.mk 2021/06/04 18:59:18 1.22
+++ pkgsrc/mk/fuse.buildlink3.mk 2021/06/23 19:08:10 1.23
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: fuse.buildlink3.mk,v 1.22 2021/06/04 18:59:18 adam Exp $ 1# $NetBSD: fuse.buildlink3.mk,v 1.23 2021/06/23 19:08:10 schmonz Exp $
2# 2#
3# Makefile fragment for packages using the FUSE framework. 3# Makefile fragment for packages using the FUSE framework.
4# 4#
5 5
6# The symbol FUSE_BUILDLINK3_MK is used by filesystems/fuse's bl3.mk, 6# The symbol FUSE_BUILDLINK3_MK is used by filesystems/fuse's bl3.mk,
7# so use something else for our include guard. 7# so use something else for our include guard.
8.if !defined(MK_FUSE_BUILDLINK3_MK) 8.if !defined(MK_FUSE_BUILDLINK3_MK)
9MK_FUSE_BUILDLINK3_MK= # defined 9MK_FUSE_BUILDLINK3_MK= # defined
10 10
11.include "bsd.fast.prefs.mk" 11.include "bsd.fast.prefs.mk"
12 12
13. if ${OPSYS} == "Darwin" 13. if ${OPSYS} == "Darwin"
14 14
@@ -28,26 +28,27 @@ override-message-fuse-pkgconfig: @@ -28,26 +28,27 @@ override-message-fuse-pkgconfig:
28 @${STEP_MSG} "Setting up usage of native fuse." 28 @${STEP_MSG} "Setting up usage of native fuse."
29 29
30override-fuse-pkgconfig: 30override-fuse-pkgconfig:
31 ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig 31 ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig
32.if exists(/usr/local/lib/pkgconfig/osxfuse.pc) 32.if exists(/usr/local/lib/pkgconfig/osxfuse.pc)
33 ${LN} -s /usr/local/lib/pkgconfig/osxfuse.pc \ 33 ${LN} -s /usr/local/lib/pkgconfig/osxfuse.pc \
34 ${BUILDLINK_DIR}/lib/pkgconfig/fuse.pc 34 ${BUILDLINK_DIR}/lib/pkgconfig/fuse.pc
35.elif exists(/usr/local/lib/pkgconfig/fuse.pc) 35.elif exists(/usr/local/lib/pkgconfig/fuse.pc)
36 ${LN} -s /usr/local/lib/pkgconfig/fuse.pc \ 36 ${LN} -s /usr/local/lib/pkgconfig/fuse.pc \
37 ${BUILDLINK_DIR}/lib/pkgconfig/fuse.pc 37 ${BUILDLINK_DIR}/lib/pkgconfig/fuse.pc
38.endif 38.endif
39 39
40BUILDLINK_PASSTHRU_DIRS+= /usr/local/include/osxfuse 40BUILDLINK_PASSTHRU_DIRS+= /usr/local/include/osxfuse
 41BUILDLINK_PASSTHRU_DIRS+= /usr/local/include/fuse
41# Too much! But allows -losxfuse to work. 42# Too much! But allows -losxfuse to work.
42BUILDLINK_PASSTHRU_DIRS+= /usr/local/lib 43BUILDLINK_PASSTHRU_DIRS+= /usr/local/lib
43 44
44. elif ${OPSYS} == "Linux" 45. elif ${OPSYS} == "Linux"
45 46
46. include "../../filesystems/fuse/buildlink3.mk" 47. include "../../filesystems/fuse/buildlink3.mk"
47 48
48. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-*) 49. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-*)
49 50
50. if !exists(/usr/include/fuse/fuse.h) 51. if !exists(/usr/include/fuse/fuse.h)
51PKG_FAIL_REASON+= "Couldn't find fuse headers, please install libfuse." 52PKG_FAIL_REASON+= "Couldn't find fuse headers, please install libfuse."
52. endif 53. endif
53. include "../../filesystems/fuse/buildlink3.mk" 54. include "../../filesystems/fuse/buildlink3.mk"