Changeset 9642

Timestamp:

06/12/08 02:41:39 (3 months ago)

Author:

vboxsync

Message:

Removed the last remains of the linux additions cross compilation in the l4 build.

Files:

• trunk/Config.kmk (modified) (10 diffs)
• trunk/src/VBox/Additions/Makefile.kmk (modified) (2 diffs)
• trunk/src/VBox/Additions/linux/Makefile.kmk (modified) (2 diffs)
• trunk/src/VBox/Additions/x11/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/Additions/x11/xgraphics/Makefile.kmk (modified) (3 diffs)
• trunk/src/VBox/Additions/x11/xmouse/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -2579 +2579 @@
-
-#
-
-
-
+.
+
+ when targeting L4
-TEMPLATE_VBOXLNXHOSTR3EXE_INST              = $(INST_BIN)
-TEMPLATE_VBOXLNXHOSTR3EXE_BLD_TRG           = linux
@@ -2610 +2610 @@
-# Note: Make sure you don't break VBOXGUESTR3CPPEXE when changing this.
-#
-# For the time being, we force 32-bitness onto this and related
-# templates (via BLD_TRG_ARCH). When we start doing 64-bit guest
-# however, they will be reverted to follow KBUILD_TARGET_ARCH.
-# So, if someone sees any weirdness happening in a 64-bit build now,
-# try do a 32-bit cross build (kmk KBUILD_TARGET_ARCH=x86) first. It
-#
-TEMPLATE_VBOXGUESTR3EXE           = VBox Guest Program
-ifeq ($(KBUILD_TARGET),win)
@@ -2635 +2629 @@
-TEMPLATE_VBOXGUESTR3EXE_INST      = $(INST_ADDITIONS)
-TEMPLATE_VBOXGUESTR3EXE_DEFS     := $(TEMPLATE_VBOXR3EXE_DEFS) IN_GUEST IN_GUEST_R3 IN_RT_R3
-1of ($(KBUILD_TARGET),l4 
+eq ($(KBUILD_TARGET),
- TEMPLATE_VBOXGUESTR3EXE_LIBS     = pthread rt m
-endif
-ifeq ($(KBUILD_TARGET),l4) # cross building linux on l4.
- TEMPLATE_VBOXGUESTR3EXE_BLD_TRG  = linux
- TEMPLATE_VBOXGUESTR3EXE_DLLSUFF  = .so
- TEMPLATE_VBOXGUESTR3EXE_SYSSUFF  = .ko
-endif
-
-#
-# Template for building R3 (dynamic) libraries for the guest additions.
-#
-
-
+ 
+ 
-## @todo add a INSTFUN that separates dlls and libs.
-ifn1of ($(KBUILD_TARGET), os2 win)
-  
-  
-  
-  
+
+
+
+
-endif
-
@@ -2660 +2649 @@
-# Template for building R3 (static) libraries for the guest additions.
-#
-
-
-
+  
+  
+  
-if1of ($(KBUILD_TARGET), solaris) ## @todo r=bird: Fix the *R3Mini template to VBOXGUESTR3DLL and remove this hack.
-  
-  
-  
+
+
+
-endif
-
@@ -2674 +2663 @@
-# This mostly about zapping the VBOXR3EXE linker flags and libraries.
-#
-  
+
-TEMPLATE_VBOXGUESTR3XF86MOD_EXTENDS = VBOXGUESTR3EXE
-TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TYPE)      = $(NO_SUCH_VARIABLE)
-TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TARGET)    = $(NO_SUCH_VARIABLE)
-TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.linux              = $(NO_SUCH_VARIABLE)
-TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE)
-TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(KBUILD_TYPE)   = $(NO_SUCH_VARIABLE)
-
-
-
+
+
- TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.release = -S
- TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.x86     = -m elf_i386
- TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.amd64   = -m elf_x86_64
-endif
- 
- 
- 
-   
+
+
+
+
-        $(VBOX_LIB_VBGL_R3_XFREE86)
-   
+
-
-
@@ -2700 +2687 @@
-# This mostly about zapping unnecessary LIBS from VBOXGUESTR3DLL and adding some flags.
-#
-  
+
-TEMPLATE_VBOXGUESTR3XORGMOD_EXTENDS = VBOXGUESTR3DLL
-
-
-
+
+
-TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS                  = $(TEMPLATE_VBOXGUESTR3DLL_CFLAGS) -std=c99
-TEMPLATE_VBOXGUESTR3XORGMOD_DEFS = $(TEMPLATE_VBOXGUESTR3DLL_DEFS) LOG_TO_BACKDOOR
- l4
+
- TEMPLATE_VBOXGUESTR3XORGMOD_LDFLAGS = $(TEMPLATE_VBOXGUESTR3DLL_LDFLAGS) -s
-endif
@@ -2720 +2706 @@
-# (This is mostly about undoing what was done to C++ for VBOXGUESTR3EXE.)
-#
-
-
+  
+  
-ifeq ($(KBUILD_TARGET),win)
- # later if necessary
-else
-
+  
- TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS = $(TEMPLATE_VBOXR3EXE_CXXFLAGS)
-endif
@@ -2733 +2719 @@
-# Template for building R0 drivers for the guest additions.
-#
-
-
-
+ 
+ 
+ 
-TEMPLATE_VBOXGUESTR0_SDKS.win.x86   = WIN32SDK W2K3DDK
-TEMPLATE_VBOXGUESTR0_SDKS.win.amd64 = W2K3DDK WINPSDKINCS
-TEMPLATE_VBOXGUESTR0_LIBS.win.x86   = \
-        $(PATH_SDK_W2K3DDK_LIB)/int64.lib
-
+ 
-ifeq ($(KBUILD_TARGET),solaris) # No VBI for the guest additions yet.
-
+ 
-endif
-
@@ -2748 +2734 @@
-# Template for building R0 libraries for the guest additions.
-#
-
-
-
+ 
+ 
+ 
-
-
@@ -2757 +2743 @@
-#   The _MINI and _SHARED are both compiled as PIC and intended for linking into a .so/.dll/.dylib.
-#
-
-
-
+ 
+ 
+ 
-ifeq ($(KBUILD_TARGET_ARCH),x86)
-
-
-
-
-
-
-
-
-
+ 
+
+ 
+
+ 
+ 
+ 
+ 
+ 
-
-

trunk/src/VBox/Additions/Makefile.kmk

@@ -2 +2 @@
-## @file
-# Top-level makefile for the VirtualBox Guest Additions.
-#
-# Cross building of the additions is generally done by remote building
-# by means of smbfs, cifs, VBOX_ONLY_ADDITIONS=1 and setting KBUILD_TARGET
-# to the desired target.
-#
-# Limited support for cross building the windows additions using wine
-# is provided. There are a couple of issues with the approach (lack of
-# signing, no VC++ 8 support, ++) that makes it unsuitable for releases.
-#
-# Building the linux additions as part of the l4 build is ok because
-# l4 is built on a linux platform. This is why we have to check if
-# KBUILD_TARGET is l4 or linux in some places, though most of the magic
-# is done in the templates (Config.kmk).
-#
-
@@ -36 +23 @@
-include $(KBUILD_PATH)/subheader.kmk
-
+#
+# Cross building of the additions is generally done by remote building
+# by means of smbfs, cifs, VBOX_ONLY_ADDITIONS=1 and setting KBUILD_TARGET
+# and KBUILD_TARGET_ARCH to the desired target and architecture.
+#
+# Limited support for cross building the windows additions using wine
+# is provided. There are a couple of issues with the approach (lack of
+# signing, no VC++ 8 support, ++) that makes it unsuitable for releases.
+#
-#
-# Note! VBOX_WITH_ADDITIONS is checked for by our parent makefile.

trunk/src/VBox/Additions/linux/Makefile.kmk

@@ -24 +24 @@
-include $(KBUILD_PATH)/subheader.kmk
-
-
-
-
-
-
-
+
+
+
-
-ifndef VBOX_OSE
@@ -39 +36 @@
-
-VBOX_PATH_LINUX_ADDITION_INSTALLER := $(PATH_SUB_CURRENT)/installer
-
+  
-
-include $(KBUILD_PATH)/subfooter.kmk

trunk/src/VBox/Additions/x11/Makefile.kmk

@@ -24 +24 @@
-
-# Include sub-makefiles.
-4 linux
+inux netbsd openbsd
- include $(PATH_SUB_CURRENT)/xclient/Makefile.kmk
- include $(PATH_SUB_CURRENT)/xgraphics/Makefile.kmk

trunk/src/VBox/Additions/x11/xgraphics/Makefile.kmk

@@ -27 +27 @@
-# vboxvideo_drv
-#
-linux l4
+ linux
- SYSMODS += vboxvideo_drv
- vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
@@ -103 +103 @@
-        vboxvideo_68.c \
-        vboxutils_68.c
-, l4
+
-
-
@@ -116 +116 @@
-DLLS += vboxvideo_drv_70
-vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
-4 l
+
- vboxvideo_drv_70_CFLAGS += \
-        -Wno-conversion -Wno-unused-parameter $(VBOX_GCC_Wno-variadic-macros) # template?

trunk/src/VBox/Additions/x11/xmouse/Makefile.kmk

@@ -28 +28 @@
-# vboxmouse_drv
-#
-linux l4
+ linux
- SYSMODS += vboxmouse_drv
- vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD