Changeset 14730 in vbox

Timestamp:

Nov 27, 2008 6:25:19 PM (16 years ago)

Author:

vboxsync

Message:

Main/USB: re-enable libhal on Linux hosts and get it right

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Main/Makefile.kmk (modified) (1 diff)
• src/VBox/Main/testcase/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -302 +302 @@
 # Enable statically linked libhal support for Linux
 ifeq ($(KBUILD_TARGET),linux)
-# VBOX_WITH_LIBHAL = 1
+ VBOX_WITH_LIBHAL = 1
 endif
 # Disable WINMM support for Windows (not implemented)
@@ -1343 +1343 @@
 # libhal settings for Linux
 ifeq ($(KBUILD_TARGET),linux)
- ifdef $(VBOX_WITH_LIBHAL)
-  VBOX_LIBHAL_CFLAGS ?= $(shell pkg-config hal --cflags)
-  VBOX_LIBHAL_CXXFLAGS ?= VBOX_LIBHAL_CFLAGS
-  VBOX_LIBHAL_LDFLAGS ?= $(shell pkg-config hal --libs)
+ ifdef VBOX_WITH_LIBHAL
+  VBOX_LIBHAL_CFLAGS := $(shell pkg-config hal --cflags)
+  VBOX_LIBHAL_CXXFLAGS := $(VBOX_LIBHAL_CFLAGS)
+  VBOX_LIBHAL_LDFLAGS := $(shell pkg-config hal --libs)
  endif
 endif

trunk/src/VBox/Main/Makefile.kmk

@@ -22 +22 @@
 SUB_DEPTH = ../../..
 include $(KBUILD_PATH)/subheader.kmk
-
 
 #

trunk/src/VBox/Main/testcase/Makefile.kmk

@@ -132 +132 @@
         $(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,)
 tstUSBLinux_LIBS     += $(PATH_OUT)/lib/USBLib.a
-ifeq ($(KBUILD_TARGET),linux)
- # Why on earth does this not work?  Config.kmk has an identical statement.
- VBOX_LIBHAL_LDFLAGS  ?= $(shell pkg-config hal --libs)
-endif
 tstUSBLinux_CFLAGS   += $(if $(VBOX_WITH_LIBHAL),$(VBOX_LIBHAL_CFLAGS),)
 tstUSBLinux_CXXFLAGS += $(if $(VBOX_WITH_LIBHAL),$(VBOX_LIBHAL_CXXFLAGS),)