Now that the freeze is over, I would like to commit the following, which
allows at least py-fuse-bindings to build ok, with ABI=64
Comments are welcome, especially on:
Any objections to the decision to support *only* OSXFUSE? Does
anyone believe there is another viable implementation?
BUILDLINK_PASSTRHOUGH_DIRS seems too coarse. Should this be
specifically including libraries? There are 18 files. However, I
think only 6 of them are necessary.
osxfuse appears to provide separate i386 and x86_64 libraries, with
the default being x86_64. So while someone could extend this bl3 to
symlink in the right ones based on ABI, I'm not really inclined to do
that, since I've decided to stick to ABI=64 on macs, which is clearly
the path of least resistance these days (on 10.9).
I'm considering preservin the fuse/osxfuse .pc symlink, so that
programs looking for osxfuse.pc will find it. But it seems that's
buggy of them, and fuse.pc is the interface. (I'll query osxfuse.)
I realize that ideally osxfuse would get built inside of pkgsrc so it
can just be a dependency. That's more than I want to take on right now.
Index: fuse.buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/fuse.buildlink3.mk,v
retrieving revision 1.16
diff -u -p -r1.16 fuse.buildlink3.mk
--- fuse.buildlink3.mk 1 Mar 2013 00:08:31 -0000 1.16
+++ fuse.buildlink3.mk 6 Apr 2014 15:18:50 -0000
@@ -12,9 +12,12 @@ MK_FUSE_BUILDLINK3_MK= # defined
. if ${OPSYS} == "Darwin"
-. if !exists(/usr/local/lib/pkgconfig/fuse.pc)
+# On Darwin, we only attempt to support "Fuse for OS X", known as
+# "OSXFUSE". MacFuse is dead, and fuse4x is merging into OSXFUSE.
+
+. if !exists(/usr/local/lib/pkgconfig/osxfuse.pc)
PKG_FAIL_REASON+= \
- "Couldn't find fuse; please install MacFUSE or OSXFUSE."
+ "Couldn't find fuse; please install OSXFUSE."
. endif
do-configure-pre-hook: override-fuse-pkgconfig
@@ -26,12 +29,12 @@ override-message-fuse-pkgconfig:
override-fuse-pkgconfig:
${RUN} \
${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \
- ${LN} -s /usr/local/lib/pkgconfig/fuse.pc \
+ ${LN} -s /usr/local/lib/pkgconfig/osxfuse.pc \
${BUILDLINK_DIR}/lib/pkgconfig/fuse.pc
-BUILDLINK_PASSTHRU_DIRS+= /usr/local/include/fuse
-BUILDLINK_PASSTHRU_DIRS+= /usr/local/include/macfuse
BUILDLINK_PASSTHRU_DIRS+= /usr/local/include/osxfuse
+# Too much! But allows -losxfuse to work.
+BUILDLINK_PASSTHRU_DIRS+= /usr/local/lib
. elif ${OPSYS} == "Linux"
Attachment:
pgpPal7P54X1G.pgp
Description: PGP signature