VirtualBox

Changeset 98213 in vbox for trunk


Ignore:
Timestamp:
Jan 22, 2023 6:23:03 PM (21 months ago)
Author:
vboxsync
Message:

/Config.kmk: X11 template cleanups. bugref:10348

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r98212 r98213  
    86288628# This mostly about zapping the VBoxR3Exe linker flags and libraries.
    86298629#
    8630 TEMPLATE_VBOXGUESTR3XF86MOD       = VBox XFree86 Guest Module
    8631 TEMPLATE_VBOXGUESTR3XF86MOD_EXTENDS = VBoxGuestR3ExeBase
    8632 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TYPE)      = $(NO_SUCH_VARIABLE)
    8633 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TARGET)    = $(NO_SUCH_VARIABLE)
     8630TEMPLATE_VBOXGUESTR3XF86MOD         := VBox XFree86 Guest Module
     8631TEMPLATE_VBOXGUESTR3XF86MOD_EXTENDS := VBoxGuestR3ExeBase
     8632TEMPLATE_VBOXGUESTR3XF86MOD_SYSSUFF := .o
     8633TEMPLATE_VBOXGUESTR3XF86MOD_DEFS     = $(TEMPLATE_VBoxGuestR3ExeBase_DEFS) VBOX_GUESTR3XF86MOD RTMEM_NO_WRAP_TO_EF_APIS
     8634TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS   = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3ExeBase_CFLAGS)) \
     8635        -fno-pie -fno-merge-constants -std=c99 -ffreestanding
     8636TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3ExeBase_CXXFLAGS)) \
     8637        -fno-pie -fno-merge-constants -ffreestanding
     8638TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS.linux             = $(VBOX_GCC_fno-stack-protector) # Remove symvers.h
     8639TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS.linux           = $(VBOX_GCC_fno-stack-protector) # Remove symvers.h
    86348640TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE)
    86358641# The GNU_HASH ELF tag is not supported by older glibc dynamic linkers.
    86368642TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.linux            = $(subst -Wl$(COMMA),,$(VBOX_LD_hash_style_sysv))
    86378643TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(KBUILD_TYPE)   = $(NO_SUCH_VARIABLE)
    8638 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS                  = -r
     8644TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS                 := -r
    86398645if1of ($(KBUILD_TARGET), dragonfly freebsd linux netbsd openbsd) # the gnu ld guys.
    8640  TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.release         = -S
    8641  TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.x86             = -m elf_i386
    8642  TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.amd64           = -m elf_x86_64
    8643 endif
    8644 TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS  = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3ExeBase_CFLAGS)) \
    8645         -fno-pie -fno-merge-constants -std=c99 -ffreestanding
    8646 TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3ExeBase_CXXFLAGS)) \
    8647         -fno-pie -fno-merge-constants -ffreestanding
    8648 TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS.linux  = $(VBOX_GCC_fno-stack-protector) # Remove symvers.h
    8649 TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS.linux = $(VBOX_GCC_fno-stack-protector) # Remove symvers.h
    8650 TEMPLATE_VBOXGUESTR3XF86MOD_SYSSUFF = .o
    8651 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS  = \
    8652         $(VBOX_LIB_VBGL_R3_XFREE86)
    8653 TEMPLATE_VBOXGUESTR3XF86MOD_DEFS  = $(TEMPLATE_VBoxGuestR3ExeBase_DEFS) VBOX_GUESTR3XF86MOD RTMEM_NO_WRAP_TO_EF_APIS
     8646 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.release        := -S
     8647 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.x86            := -m elf_i386
     8648 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.amd64          := -m elf_x86_64
     8649endif
     8650TEMPLATE_VBOXGUESTR3XF86MOD_LIBS                     = $(VBOX_LIB_VBGL_R3_XFREE86)
     8651TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TYPE)      = $(NO_SUCH_VARIABLE)
     8652TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TARGET)    = $(NO_SUCH_VARIABLE)
    86548653
    86558654
     
    86578656# Template for XFree86 guest libraries.
    86588657#
    8659 TEMPLATE_VBOXGUESTR3XF86LIB         = VBox XFree86 Guest Library
    8660 TEMPLATE_VBOXGUESTR3XF86LIB_EXTENDS = VBOXGUESTR3XF86MOD
    8661 TEMPLATE_VBOXGUESTR3XF86LIB_INST    = $(INST_ADDITIONS_LIB)
     8658TEMPLATE_VBOXGUESTR3XF86LIB         := VBox XFree86 Guest Library
     8659TEMPLATE_VBOXGUESTR3XF86LIB_EXTENDS := VBOXGUESTR3XF86MOD
     8660TEMPLATE_VBOXGUESTR3XF86LIB_INST     = $(INST_ADDITIONS_LIB)
    86628661
    86638662
     
    86668665# This mostly about zapping unnecessary LIBS from VBoxGuestR3DllNonPedantic and adding some flags.
    86678666#
    8668 TEMPLATE_VBOXGUESTR3XORGMOD       = VBox X.org Guest Module
    8669 TEMPLATE_VBOXGUESTR3XORGMOD_EXTENDS = VBoxGuestR3DllNonPedantic
    8670 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TYPE)     = $(NO_SUCH_VARIABLE)
    8671 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TARGET)   = $(NO_SUCH_VARIABLE)
    8672 TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3DllNonPedantic_CFLAGS)) -std=c99
     8667TEMPLATE_VBOXGUESTR3XORGMOD         := VBox X.org Guest Module
     8668TEMPLATE_VBOXGUESTR3XORGMOD_EXTENDS := VBoxGuestR3DllNonPedantic
     8669TEMPLATE_VBOXGUESTR3XORGMOD_DEFS     = $(TEMPLATE_VBoxGuestR3DllNonPedantic_DEFS) VBOX_GUESTR3XORGMOD RTMEM_NO_WRAP_TO_EF_APIS
     8670ifeq ($(KBUILD_TARGET_ARCH),amd64)
     8671 TEMPLATE_VBOXGUESTR3XORGMOD_DEFS   += _XSERVER64
     8672endif
     8673TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS   = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3DllNonPedantic_CFLAGS)) -std=c99
    86738674TEMPLATE_VBOXGUESTR3XORGMOD_CXXFLAGS = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3DllNonPedantic_CXXFLAGS))
    86748675if1of ($(KBUILD_TARGET), linux)
    86758676 TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS += -Wno-conversion -Wno-unused-parameter
    86768677endif
    8677 TEMPLATE_VBOXGUESTR3XORGMOD_DEFS = $(TEMPLATE_VBoxGuestR3DllNonPedantic_DEFS) VBOX_GUESTR3XORGMOD RTMEM_NO_WRAP_TO_EF_APIS
    8678 ifeq ($(KBUILD_TARGET_ARCH),amd64)
    8679  TEMPLATE_VBOXGUESTR3XORGMOD_DEFS += _XSERVER64
    8680 endif
    8681 TEMPLATE_VBOXGUESTR3XORGMOD_LDFLAGS = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS) $(VBOX_GCC_SANITIZER_LDFLAGS),$(TEMPLATE_VBoxGuestR3DllNonPedantic_LDFLAGS))
    8682 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS = \
    8683         $(VBOX_LIB_VBGL_R3_XORG)
    8684 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.freebsd += \
    8685         iconv
     8678TEMPLATE_VBOXGUESTR3XORGMOD_LDFLAGS  = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS) $(VBOX_GCC_SANITIZER_LDFLAGS),$(TEMPLATE_VBoxGuestR3DllNonPedantic_LDFLAGS))
     8679TEMPLATE_VBOXGUESTR3XORGMOD_LIBS                    = $(VBOX_LIB_VBGL_R3_XORG)
     8680TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TYPE)     = $(NO_SUCH_VARIABLE)
     8681TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TARGET)   = $(NO_SUCH_VARIABLE)
     8682TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.freebsd           += iconv
    86868683
    86878684
     
    86898686# Template for X.Org guest libraries.
    86908687#
    8691 TEMPLATE_VBOXGUESTR3XORGLIB         = VBox X.Org Guest Library
    8692 TEMPLATE_VBOXGUESTR3XORGLIB_EXTENDS = VBOXGUESTR3XORGMOD
    8693 TEMPLATE_VBOXGUESTR3XORGLIB_INST    = $(INST_ADDITIONS_LIB)
     8688TEMPLATE_VBOXGUESTR3XORGLIB         := VBox X.Org Guest Library
     8689TEMPLATE_VBOXGUESTR3XORGLIB_EXTENDS := VBOXGUESTR3XORGMOD
     8690TEMPLATE_VBOXGUESTR3XORGLIB_INST     = $(INST_ADDITIONS_LIB)
    86948691
    86958692
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette