Changeset 39876 in vbox

Timestamp:

Jan 25, 2012 3:57:58 PM (13 years ago)

Author:

vboxsync

Message:

Config.kmk Main/webservice: Solaris 11 build fix, use proper gsoap binaries.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Main/webservice/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -2607 +2607 @@
   VBOX_WITHOUT_ADDITIONS := 1
   VBOX_WITH_ADDITIONS =
+ else ifeq ($(VBOX_SOLARIS_VERSION),511)
+  # uname -v can report "snv_XYZ" or "11.X"
+  VBOX_SOLARIS_11_VERSION = $(shell uname -v | sed 's/snv_//' | cut -f1 -d'.')
+  ifeq ($(VBOX_SOLARIS_11_VERSION),11)
+   VBOX_SOLARIS_11_VERSION = $(shell pkg contents -H -t set -o pkg.fmri entire | head -1 | sed 's/^.*\@//;s/\:.*//;s/.*,//' | cut -f2 -d'-' | cut -f2 -d'.')
+  endif
+
+  # OSS audio support for Solaris
+ VBOX_WITH_SOLARIS_OSS := $(if-expr $(VBOX_SOLARIS_11_VERSION) >= 115,1,)
  else
-  ## @todo r=bird: Why eval, and why export? Actually, since this isn't used anywhere, why not
-  # VBOX_WITH_SOLARIS_OSS := $(if-expr $(shell uname -v | cut -f2 -d'_')) >= 115,1,)
-  $(eval export VBOX_SOLARIS_SNV_VERSION := $(shell uname -v | cut -f2 -d'_'))
-
-  # OSS audio support for Solaris
- VBOX_WITH_SOLARIS_OSS := $(if-expr $(VBOX_SOLARIS_SNV_VERSION) >= 115,1,)
+  $(error Unsupported Solaris host version $(VBOX_SOLARIS_VERSION))
  endif
 endif

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

@@ -118 +118 @@
  else if "$(KBUILD_HOST)" == "linux"
   VBOX_PATH_GSOAP_BIN  := $(VBOX_PATH_GSOAP_BIN)/linux386
+ else if "$(KBUILD_HOST)" == "solaris"
+  if $(VBOX_SOLARIS_11_VERSION) >= 164
+   VBOX_PATH_GSOAP_BIN  := $(VBOX_PATH_GSOAP_BIN)/solaris11.x86
+  else
+   VBOX_PATH_GSOAP_BIN  := $(VBOX_PATH_GSOAP_BIN)/solaris.x86
+  endif
  else
   VBOX_PATH_GSOAP_BIN  := $(VBOX_PATH_GSOAP_BIN)/$(KBUILD_HOST).x86