Changeset 78902 in vbox for trunk/src/VBox/Additions/common/VBoxGuest/linux

Timestamp:

May 31, 2019 7:14:11 PM (6 years ago)

Author:

vboxsync

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

131021

Message:

VBoxGuest/linux: Try speed up GA installation by combining the IPRT and VBgl bits into two source files.

Location:

trunk/src/VBox/Additions/common/VBoxGuest/linux

Files:

• Makefile (modified) (3 diffs)
• combined-agnostic.c (added)
• combined-os-specific.c (added)
• files_vboxguest (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/linux/Makefile

@@ -30 +30 @@
 VBOXGUEST_DIR = $(VBOX_MODULE_SRC_DIR)
 
+#VBOX_WITHOUT_COMBINED_SOURCES=1
+
 VBOXMOD_NAME = vboxguest
 VBOXMOD_OBJS = \
         VBoxGuest-linux.o \
-        VBoxGuest.o \
+        VBoxGuest.o
+ifndef VBOX_WITHOUT_COMBINED_SOURCES
+VBOXMOD_OBJS += \
+        common/string/strformatrt.o \
+        combined-agnostic.o \
+        combined-os-specific.o
+else  # VBOX_WITHOUT_COMBINED_SOURCES
+VBOXMOD_OBJS += \
         VBoxGuestR0LibGenericRequest.o \
         VBoxGuestR0LibHGCMInternal.o \
@@ -114 +123 @@
         VBox/log-vbox.o \
         VBox/logbackdoor.o
-ifeq ($(BUILD_TARGET_ARCH),x86)
+ ifeq ($(BUILD_TARGET_ARCH),x86)
 VBOXMOD_OBJS += \
         common/math/gcc/divdi3.o \
@@ -122 +131 @@
         common/math/gcc/umoddi3.o \
         common/math/gcc/qdivrem.o
-endif
-ifeq ($(BUILD_TARGET_ARCH),amd64)
+ endif
+ ifeq ($(BUILD_TARGET_ARCH),amd64)
 VBOXMOD_OBJS += common/alloc/heapsimple.o
-endif
+ endif
+endif # VBOX_WITHOUT_COMBINED_SOURCES
 
 VBOXMOD_DEFS = \

trunk/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest

@@ -88 +88 @@
     ${PATH_ROOT}/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h=>VBoxGuestInternal.h \
     ${PATH_ROOT}/src/VBox/Additions/common/VBoxGuest/linux/Makefile=>Makefile \
+    ${PATH_ROOT}/src/VBox/Additions/common/VBoxGuest/linux/combined-agnostic.c=>combined-agnostic.c \
+    ${PATH_ROOT}/src/VBox/Additions/common/VBoxGuest/linux/combined-os-specific.c=>combined-os-specific.c \
     ${PATH_ROOT}/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibInternal.h=>VBoxGuestR0LibInternal.h \
     ${PATH_ROOT}/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibGenericRequest.cpp=>VBoxGuestR0LibGenericRequest.c \