Changeset 85176 in vbox

Timestamp:

Jul 10, 2020 12:54:06 PM (4 years ago)

Author:

vboxsync

Message:

/Config.kmk,VBoxUSB/darwin/Makefile.kmk: Must use MacOSX10.10 or older SDK for building VBoxUSB because the IOUSBDevice.h was removed in later versions. bugref:9790

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/HostDrivers/VBoxUSB/darwin/Makefile.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -5185 +5185 @@
 endif
 
+ifeq ($(KBUILD_TARGET),darwin)
+#
+# A variant of VBOXR0DRV that uses the 10.10 SDK.
+#
+TEMPLATE_VBoxR0DrvOSX10.10 = VBoxR0Drv variant using the 10.10 SDK
+TEMPLATE_VBoxR0DrvOSX10.10_EXTENDS  = VBOXR0DRV
+TEMPLATE_VBoxR0DrvOSX10.10_SDKS     = MACOSX1010
+TEMPLATE_VBoxR0DrvOSX10.10_INCS     = $(filter-out $(VBOX_PATH_MACOSX_SDK)/%,$(TEMPLATE_VBOXR0DRV_INCS)) \
+        $(PATH_SDK_MACOSX1010)/System/Library/Frameworks/Kernel.framework/PrivateHeaders \
+        $(PATH_SDK_MACOSX1010)/System/Library/Frameworks/Kernel.framework/Headers
+TEMPLATE_VBoxR0DrvOSX10.10_DEFS     = $(filter-out $(VBOX_DARWIN_DEF_SDK_DEFS),$(TEMPLATE_VBOXR0DRV_DEFS))
+
+endif
+
 #
 # Template for building libraries used by ring-0 drivers.

trunk/src/VBox/HostDrivers/VBoxUSB/darwin/Makefile.kmk

@@ -28 +28 @@
 include $(KBUILD_PATH)/subheader.kmk
 
+
 #
 # VBoxUSB.kext - The Darwin Kernel Extension.
@@ -34 +35 @@
 # Leopard (x86) and Snow Leopard (x86/amd64)
 SYSMODS.darwin       += VBoxUSB
-VBoxUSB_TEMPLATE      = VBOXR0DRV
+VBoxUSB_TEMPLATE     := VBOXR0DRV
+ifdef KMK_WITH_VERSION_COMPARE ## @todo @bugref{9790}: Remove after updating kmk.
+if "$(VBOX_DEF_MACOSX_VERSION_MIN)" vge "10.11" # The IOUSBDevice.h header was removed in 10.11.
+VBoxUSB_TEMPLATE     := VBoxR0DrvOSX10.10
+endif
+endif                          ## @todo @bugref{9790}: Remove after updating kmk.
 VBoxUSB_INST          = $(INST_VBOXUSB)Contents/MacOS/
 VBoxUSB_DEBUG_INST.darwin = $(patsubst %/,%,$(INST_VBOXUSB))