Changeset 60425 in vbox

Timestamp:

Apr 11, 2016 1:38:17 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

106511

Message:

Config.kmk/src/VBox/VMM/testcase/Makefile.kmk: Solaris 11 compatibility: improve JDK location detection and improved nm handling (all versions default to decimal numbers and some have type N instead of A in the output, which resulted in tstAsmStructsRC not testing anything)

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/VMM/testcase/Makefile.kmk (modified) (2 diffs)
• tools/solaris.amd64 (modified) (1 prop)

trunk/Config.kmk

@@ -1941 +1941 @@
  VBOX_NM ?= $(PATH_TOOL_MINGW32)/bin/nm.exe -p
 else
- VBOX_NM ?= nm -p
+ VBOX_NM ?= nm -p -t x
 endif
 
@@ -6424 +6424 @@
  ifeq ($(KBUILD_TARGET),solaris)
   # VBOX_JAVA_HOME ?= /usr/jdk/jdk1.6.0
-  VBOX_JAVA_HOME ?= /usr/java
+  VBOX_JAVA_HOME ?= $(firstword $(abspath $(wildcard \
+        /usr/jdk/latest/include/.. \
+        /usr/jdk/instances/jdk1.8*/include/.. \
+        /usr/jdk/instances/jdk1.7*/include/.. \
+        /usr/jdk/instances/jdk1.6*/include/.. \
+        )) /usr/java)
  endif
 

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

@@ -589 +589 @@
                 -e '/STAMPROFILEADV/d' \
                 \
-                -e '/00[0-9a-fA-F]* [aA] [^_.]*\./!d' \
-                -e 's/\(00[0-9a-fA-F]*\) [aA] \([^.]*\)\.\(.*$$\)/    CHECK_OFF(\2, 0x0\1, \3);/' \
+                -e '/^\(0x\)\{0,1\}00[0-9a-fA-F]* [aAnN] [^_.]*\./!d' \
+                -e 's/^\(0x\)\{0,1\}\(00[0-9a-fA-F]*\) [aAnN] \([^.]*\)\.\(.*$$\)/    CHECK_OFF(\3, 0x0\2, \4);/' \
                 --output [email protected] [email protected]
         $(QUIET)$(SED) \
@@ -599 +599 @@
                 -e '/HMCPU_size$$/d' \
                 \
-                -e '/00[0-9a-fA-F]* [aA] [^_.]*_size$$/!d' \
-                -e 's/\(00[0-9a-fA-F]*\) [aA] \([^_.]*\)_size/    CHECK_SIZE(\2, 0x0\1);/' \
+                -e '/^\(0x\)\{0,1\}00[0-9a-fA-F]* [aAnN] [^_.]*_size$$/!d' \
+                -e 's/^\(0x\)\{0,1\}\(00[0-9a-fA-F]*\) [aAnN] \([^_.]*\)_size/    CHECK_SIZE(\3, 0x0\2);/' \
                 --append [email protected] [email protected]
         $(QUIET)$(MV) -f [email protected] $@

trunk/tools/solaris.amd64

@@ -1 +1 @@
 libSDL
+libsdl
 qt
 libXcursor

@@ -1 +1 @@
 libSDL
+libsdl
 qt
 libXcursor

@@ -1 +1 @@
 libSDL
+libsdl
 qt
 libXcursor