Changeset 762 in vbox for trunk/Config.kmk

Timestamp:

Feb 7, 2007 11:15:42 PM (18 years ago)

Author:

vboxsync

Message:

• Additions, Config.kmk, Runtime:

o Make the additions build on linux.amd64. All the Ring-0 stuff is

skipped there because of /usr/linux/.config dependencies of the
linux stuff.

o While at it, I've removed the gcc as ld hacks and changed the

linking of the X drivers. The latter is a bit risky of course.

File:

• trunk/Config.kmk (modified) (7 diffs)

trunk/Config.kmk

@@ -101 +101 @@
 # Build linux / win32 additions.
 ifeq ($(BUILD_TARGET),linux)
+  VBOX_WITH_LINUX_ADDITIONS = 1
  ifeq ($(BUILD_TARGET_ARCH),x86) # later on amd64 too.
-  VBOX_WITH_LINUX_ADDITIONS = 1
   VBOX_WITH_WIN32_ADDITIONS = 1
  endif
@@ -112 +112 @@
 ifeq ($(BUILD_TARGET),win)
  VBOX_WITH_WIN32_ADDITIONS = 1
+endif
+ifdef VBOX_WITH_LINUX_ADDITIONS
+ ifeq ($(BUILD_TARGET).$(BUILD_PLATFORM_ARCH),linux.x86)
+  VBOX_WITH_LINUX_ADDITIONS_32BIT_R0 = 1
+ endif
 endif
 # Enable the building of shared folders in the windows additions.
@@ -266 +271 @@
 endif
 
-#
-# HACK ALERT!
-# OVerride anyone attempting to build Linux/GNU additions when targeting AMD64.
-#
-ifdef VBOX_WITH_LINUX_ADDITIONS
- ifeq ($(BUILD_TARGET_ARCH),amd64)
-  VBOX_WITH_LINUX_ADDITIONS :=
- endif
-endif
+##
+## HACK ALERT!
+## OVerride anyone attempting to build Linux/GNU additions when targeting AMD64.
+##
+#ifdef VBOX_WITH_LINUX_ADDITIONS
+# ifeq ($(BUILD_TARGET_ARCH),amd64)
+#  VBOX_WITH_LINUX_ADDITIONS :=
+# endif
+#endif
 
 #
@@ -1840 +1845 @@
 # Not properly realized yet.
 #
-
 TEMPLATE_VBOXLNX32GUESTR0         = Template for *syntax checking* linux guest additions kernel modules
 TEMPLATE_VBOXLNX32GUESTR0_TOOL    = $(VBOX_GCC_TOOL)
@@ -1863 +1867 @@
 endif
 
+
+#
+# Tools and templates for building 32-bit linux guest additions.
+#
+TOOL_VBOXLNX32NOCPPLD = Linker tool replacing the VBOX_GCC32_TOOL linker (g++).
+TOOL_VBOXLNX32NOCPPLD_LINK_PROGRAM_OUTPUT = $(outbase).map
+TOOL_VBOXLNX32NOCPPLD_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
+TOOL_VBOXLNX32NOCPPLD_LINK_PROGRAM_DEPORD =
+define TOOL_VBOXLNX32NOCPPLD_LINK_PROGRAM_CMDS
+        $(QUIET)$(TOOL_$(VBOX_GCC32_TOOL)_CC) $(flags) -o $(out) $(objs)\
+                $(foreach p,$(libpath), -L$(p))\
+                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
+                $(call TOOL_$(VBOX_GCC32_TOOL)_LD_MAP,$(outbase).map)
+endef
+TOOL_VBOXLNX32NOCPPLD_LINK_DLL_OUTPUT = $(outbase).map
+TOOL_VBOXLNX32NOCPPLD_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
+TOOL_VBOXLNX32NOCPPLD_LINK_DLL_DEPORD =
+# (no SONAME for now)
+define TOOL_VBOXLNX32NOCPPLD_LINK_DLL_CMDS
+        $(QUIET)$(TOOL_$(VBOX_GCC32_TOOL)_CC) $(TOOL_$(VBOX_GCC32_TOOL)_LDFLAGS.dll) $(flags) -o $(out)\
+                $(objs)\
+                $(foreach p,$(libpath), -L$(p))\
+                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
+                $(call TOOL_$(VBOX_GCC32_TOOL)_LD_MAP,$(outbase).map)
+endef
+TOOL_VBOXLNX32NOCPPLD_LINK_SYSMOD_OUTPUT = $(outbase).map
+TOOL_VBOXLNX32NOCPPLD_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
+TOOL_VBOXLNX32NOCPPLD_LINK_SYSMOD_DEPORD =
+define TOOL_VBOXLNX32NOCPPLD_LINK_SYSMOD_CMDS
+        $(QUIET)$(TOOL_$(VBOX_GCC32_TOOL)_LD_SYSMOD) $(TOOL_VBOXLNX32NOCPPLD_LDFLAGS.sysmod) $(flags) -o $(out) $(objs)\
+                $(foreach p,$(libpath), -L$(p))\
+                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
+                $(call TOOL_$(VBOX_GCC32_TOOL)_LD_SYSMOD_MAP,$(outbase).map)
+endef
+
 TEMPLATE_VBOXLNX32GUESTR3EXE                   = Template for building 32-bit linux guest additions programs.
 TEMPLATE_VBOXLNX32GUESTR3EXE_INST              = $(INST_ADDITIONS)
@@ -1871 +1910 @@
 TEMPLATE_VBOXLNX32GUESTR3EXE_ASTOOL            = YASM
 TEMPLATE_VBOXLNX32GUESTR3EXE_ASFLAGS           = -f elf32 -DASM_FORMAT_ELF -D__YASM__ -w+orphan-labels
-TEMPLATE_VBOXLNX32GUESTR3EXE_DEFS              = IN_RING3 IN_GUEST_R3
+TEMPLATE_VBOXLNX32GUESTR3EXE_DEFS              = IN_RING3 IN_GUEST_R3 HC_ARCH_BITS=32 GC_ARCH_BITS=32
 TEMPLATE_VBOXLNX32GUESTR3EXE_CXXFLAGS          = -g -Wall -pedantic -Wno-long-long -Wno-trigraphs -pipe $(VBOX_GCC_fno-stack-protector)
 TEMPLATE_VBOXLNX32GUESTR3EXE_CXXFLAGS.debug    = -fno-inline
@@ -1882 +1921 @@
 TEMPLATE_VBOXLNX32GUESTR3EXE_CFLAGS.kprofile   = $(TEMPLATE_VBOXLNX32GUESTR3EXE_CXXFLAGS.kprofile)
 TEMPLATE_VBOXLNX32GUESTR3EXE_CFLAGS            = -g -Wall -pedantic -Wno-long-long -Wno-trigraphs -pipe -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations $(VBOX_GCC_fno-stack-protector)
-TEMPLATE_VBOXLNX32GUESTR3EXE_LDFLAGS           = # -static
-TEMPLATE_VBOXLNX32GUESTR3EXE_LIBS              = # pthread m $(LIB_UUID) rt dl
-
-TEMPLATE_VBOXLNX32GUESTR3LIB                   = Template for building 32-bit linux guest additions programs.
+# No LDFLAGS nor LIBS!
+
+TEMPLATE_VBOXLNX32GUESTR3EXENOCPP              = Template for building 32-bit linux guest additions programs without any C++.
+TEMPLATE_VBOXLNX32GUESTR3EXENOCPP_EXTENDS      = VBOXLNX32GUESTR3EXE
+TEMPLATE_VBOXLNX32GUESTR3EXENOCPP_LDTOOL       = VBOXLNX32NOCPPLD
+# No LDFLAGS nor LIBS!
+
+TEMPLATE_VBOXLNX32GUESTR3DLLNOCPP              = Template for building 32-bit linux guest additions shared objects without any C++.
+TEMPLATE_VBOXLNX32GUESTR3DLLNOCPP_EXTENDS      = VBOXLNX32GUESTR3EXE
+TEMPLATE_VBOXLNX32GUESTR3DLLNOCPP_LDTOOL       = VBOXLNX32NOCPPLD
+TEMPLATE_VBOXLNX32GUESTR3DLLNOCPP_CFLAGS       = -fPIC $(TEMPLATE_VBOXLNX32GUESTR3EXE_CFLAGS)
+TEMPLATE_VBOXLNX32GUESTR3DLLNOCPP_CXXFLAGS     = -fPIC $(TEMPLATE_VBOXLNX32GUESTR3EXE_CXXFLAGS)
+TEMPLATE_VBOXLNX32GUESTR3DLLNOCPP_LDFLAGS      = -fPIC
+
+TEMPLATE_VBOXLNX32GUESTR3LIB                   = Template for building 32-bit linux guest additions libraries.
 TEMPLATE_VBOXLNX32GUESTR3LIB_EXTENDS           = VBOXLNX32GUESTR3EXE
 TEMPLATE_VBOXLNX32GUESTR3LIB_INST              = $(INST_ADDITION_LIB)
-
-TEMPLATE_VBOXLNX32GUESTR3                      = Template for building 32-bit linux guest additions libraries.
-TEMPLATE_VBOXLNX32GUESTR3_EXTENDS              = VBOXLNX32GUESTR3EXE
-TEMPLATE_VBOXLNX32GUESTR3_LDFLAGS              = -static
-TEMPLATE_VBOXLNX32GUESTR3_LIBS                 = pthread m $(LIB_UUID) rt dl
-
-
-
-##
-## efence
-##
-#TEMPLATE_VBOXR3_CFLAGS             += -include efence.h
-#TEMPLATE_VBOXR3_CXXFLAGS           += -include efence.h
-#TEMPLATE_VBOXMAIN_CFLAGS           += -include efence.h
-#TEMPLATE_VBOXMAIN_CXXFLAGS         += -include efence.h
-#TEMPLATE_VBOXR3_LIBS               += efence
-#TEMPLATE_VBOXMAIN_LIBS             += efence