Changeset 75976 in vbox

Timestamp:

Dec 5, 2018 3:40:01 PM (6 years ago)

Author:

vboxsync

Message:

vboximg-mount: Use the osxfuse tools supplied on darwin for building and enable building on darwin

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/ImageMounter/vboximg-mount/Makefile.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -830 +830 @@
 #VBOX_WITH_MORE_NT4_COMPAT_BINARIES = 1
 # Set this to enable building of the vboximg-mount FUSE mounting utility.
-#VBOX_WITH_VBOXIMGMOUNT = 1
+if1of ($(KBUILD_TARGET), darwin)
+ VBOX_WITH_VBOXIMGMOUNT = 1
+endif
 ## @}
 

trunk/src/VBox/ImageMounter/vboximg-mount/Makefile.kmk

@@ -19 +19 @@
 include $(KBUILD_PATH)/subheader.kmk
 
+ifeq ($(KBUILD_TARGET),darwin)
+ VBOX_PATH_FUSE := $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/osxfuse/v*)))
+ ifneq ($(VBOX_PATH_FUSE),)
+  LIB_FUSE     := $(VBOX_PATH_FUSE)/lib/libosxfuse.dylib
+  LIBPATH_FUSE := $(VBOX_PATH_FUSE)/lib
+  FUSE_INCS    := $(VBOX_PATH_FUSE)/include/osxfuse
+ else
+  LIB_FUSE     := /usr/local/lib/libosxfuse.dylib
+  LIBPATH_FUSE := /usr/local/lib
+  FUSE_INCS    := /usr/local/include/osxfuse \
+        /usr/local/include
+ endif
+else
+ LIB_FUSE := fuse
+ FUSE_INCS := /usr/include
+endif
+
 #
 # vboximg-mount - Disk Image Flatting FUSE Program.
@@ -35 +52 @@
 vboximg-mount_LIBS = \
         $(LIB_DDU) \
-        $(LIB_RUNTIME)
+        $(LIB_RUNTIME) \
+        $(LIB_FUSE)
 
-vboximg-mount_INCS.darwin = \
-    /usr/local/include \
-    /usr/local/include/osxfuse \
-vboximg-mount_CXXFLAGS.darwin = -std=c++11
-
-vboximg-mount_LIBS.darwin = /usr/local/lib/libosxfuse.dylib
-vboximg-mount_LIBS.linux = fuse
-vboximg-mount_LIBS.freebsd = fuse
+vboximg-mount_INCS = $(FUSE_INCS)
+#vboximg-mount_CXXFLAGS.darwin = -std=c++11
 
 include $(FILE_KBUILD_SUB_FOOTER)