Thu Jan 28 20:50:08 2016 UTC ()
Deal with type hiding under NetBSD-current to e.g. fix the build
of e.g. the "fuse-ext2" package.


(tron)
diff -r1.18 -r1.19 pkgsrc/mk/fuse.buildlink3.mk
cvs diff -r1.18 -r1.19 pkgsrc/mk/fuse.buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/mk/fuse.buildlink3.mk 2015/02/04 23:44:34 1.18
+++ pkgsrc/mk/fuse.buildlink3.mk 2016/01/28 20:50:07 1.19
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: fuse.buildlink3.mk,v 1.18 2015/02/04 23:44:34 tnn Exp $ 1# $NetBSD: fuse.buildlink3.mk,v 1.19 2016/01/28 20:50:07 tron 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
@@ -43,26 +43,27 @@ BUILDLINK_PASSTHRU_DIRS+= /usr/local/lib @@ -43,26 +43,27 @@ BUILDLINK_PASSTHRU_DIRS+= /usr/local/lib
43. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-*) 43. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-*)
44 44
45. if !exists(/usr/include/fuse/fuse.h) 45. if !exists(/usr/include/fuse/fuse.h)
46PKG_FAIL_REASON+= "Couldn't find fuse headers, please install libfuse." 46PKG_FAIL_REASON+= "Couldn't find fuse headers, please install libfuse."
47. endif 47. endif
48. include "../../filesystems/fuse/buildlink3.mk" 48. include "../../filesystems/fuse/buildlink3.mk"
49 49
50. elif ${OPSYS} == "NetBSD" || ${OPSYS} == "Minix" || \ 50. elif ${OPSYS} == "NetBSD" || ${OPSYS} == "Minix" || \
51 !empty(MACHINE_PLATFORM:MDragonFly-[3-9]*-*) 51 !empty(MACHINE_PLATFORM:MDragonFly-[3-9]*-*)
52. if !exists(/usr/include/fuse.h) 52. if !exists(/usr/include/fuse.h)
53PKG_FAIL_REASON+= "Couldn't find fuse headers, please install librefuse." 53PKG_FAIL_REASON+= "Couldn't find fuse headers, please install librefuse."
54. endif 54. endif
55 55
 56CFLAGS.NetBSD+= -D_KERNTYPES
56LDFLAGS.DragonFly+= -lpuffs 57LDFLAGS.DragonFly+= -lpuffs
57 58
58. if !empty(USE_TOOLS:C/:.*//:Mpkg-config) 59. if !empty(USE_TOOLS:C/:.*//:Mpkg-config)
59do-configure-pre-hook: override-fuse-pkgconfig 60do-configure-pre-hook: override-fuse-pkgconfig
60 61
61BLKDIR_PKGCFG= ${BUILDLINK_DIR}/lib/pkgconfig 62BLKDIR_PKGCFG= ${BUILDLINK_DIR}/lib/pkgconfig
62FUSE_PKGCFGF= fuse.pc 63FUSE_PKGCFGF= fuse.pc
63 64
64override-fuse-pkgconfig: override-message-fuse-pkgconfig 65override-fuse-pkgconfig: override-message-fuse-pkgconfig
65override-message-fuse-pkgconfig: 66override-message-fuse-pkgconfig:
66 @${STEP_MSG} "Generating pkg-config file for builtin fuse package." 67 @${STEP_MSG} "Generating pkg-config file for builtin fuse package."
67 68
68override-fuse-pkgconfig: 69override-fuse-pkgconfig: