Changeset 36222 in vbox

Timestamp:

Mar 9, 2011 12:36:23 PM (14 years ago)

Author:

vboxsync

Message:

Added VBOX_GTAR variable, fixing solaris build issue.

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Frontends/Common/VBoxKeyboard/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -1603 +1603 @@
 VBOX_FILESPLIT ?= $(PATH_OBJ)/filesplitter/filesplitter$(HOSTSUFF_EXE)
 
+# GNU tar if present.
+if1of ($(KBUILD_TARGET), linux os2 win)
+ VBOX_GTAR ?= tar
+else if1of ($(KBUILD_TARGET), freebsd solaris)
+ VBOX_GTAR ?= gtar
+endif
+
 # mkisofs
 ifeq ($(KBUILD_HOST),win)
@@ -2774 +2781 @@
         -Wshadow -Wuninitialized -Wunused-function -Wunused-label -Wunused-value -Wunused-variable \
         -Wformat \
-        -O2 -nodefaultlibs -fno-omit-frame-pointer -fno-strict-aliasing -fno-common -fno-exceptions -fno-rtti 
+        -O2 -nodefaultlibs -fno-omit-frame-pointer -fno-strict-aliasing -fno-common -fno-exceptions -fno-rtti
 TEMPLATE_VBOXR0DRV_CXXFLAGS.x86       = $(TEMPLATE_VBOXR0DRV_CFLAGS.x86)
 TEMPLATE_VBOXR0DRV_CXXFLAGS.amd64     = $(TEMPLATE_VBOXR0DRV_CFLAGS.amd64)

trunk/src/VBox/Frontends/Common/VBoxKeyboard/Makefile.kmk

@@ -69 +69 @@
         $(QUIET)$(RM) -f -- $@ $(patsubst %.bz2,%,$@)
         $(QUIET)$(MKDIR) -p $(@D)
-if1of ($(KBUILD_TARGET), freebsd)
-        $(QUIET)tar -cjf $@ \
+ifdef VBOX_GTAR
+        $(QUIET)$(VBOX_GTAR) --owner 0 --group 0 --ignore-failed-read -cjRf $@ \
                 -C $(VBOX_KEYBOARD_STAGE_DIR) VBoxKeyboard
 else
-        $(QUIET)tar --owner 0 --group 0 --ignore-failed-read -cjRf $@ \
+        $(QUIET)tar -cjf $@ \
                 -C $(VBOX_KEYBOARD_STAGE_DIR) VBoxKeyboard
 endif