Changeset 104758 in vbox

Timestamp:

May 22, 2024 1:29:56 PM (10 months ago)

Author:

vboxsync

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

163322

Message:

/Config.kmk,libxml2,liblzma: Introduced a -x86 variation of the VBoxR3RuntimeDllNonPedantic template for use with libraries that goes into VBoxRT-x86.dll. Fixes a bunch of linker warnings about calling dllimport'ed functions within the DLL. Some cleanups.

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/libs/liblzma-5.4.1/Makefile.kmk (modified) (4 diffs)
• src/libs/libxml2-2.12.6/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -7218 +7218 @@
 #
 TEMPLATE_VBoxR3RuntimeDll = For libraries that are linked into VBoxRT.
-TEMPLATE_VBoxR3RuntimeDll_EXTENDS = VBoxR3Dll
-TEMPLATE_VBoxR3RuntimeDll_DEFS    = $(TEMPLATE_VBoxR3Dll_DEFS) IN_RT_R3
+TEMPLATE_VBoxR3RuntimeDll_EXTENDS  := VBoxR3Dll
+TEMPLATE_VBoxR3RuntimeDll_DEFS      = $(TEMPLATE_VBoxR3Dll_DEFS) IN_RT_R3
 if defined(VBOX_WITH_MORE_NT4_COMPAT_BINARIES) && "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "win.x86"
  TEMPLATE_VBoxR3RuntimeDll_CFLAGS   = $(filter-out -MD$(VBOX_VCC_CRT_TYPE), $(TEMPLATE_VBoxR3Dll_CFLAGS)) -MT$(VBOX_VCC_CRT_TYPE)
@@ -7235 +7235 @@
 #
 TEMPLATE_VBoxR3RuntimeDllNonPedantic = For libraries that are linked into VBoxRT, but must be excluded from -pedantic warnings.
-TEMPLATE_VBoxR3RuntimeDllNonPedantic_EXTENDS = VBoxR3DllNonPedantic
-TEMPLATE_VBoxR3RuntimeDllNonPedantic_DEFS    = $(TEMPLATE_VBoxR3DllNonPedantic_DEFS) IN_RT_R3
+TEMPLATE_VBoxR3RuntimeDllNonPedantic_EXTENDS  := VBoxR3DllNonPedantic
+TEMPLATE_VBoxR3RuntimeDllNonPedantic_DEFS      = $(TEMPLATE_VBoxR3DllNonPedantic_DEFS) IN_RT_R3
 if defined(VBOX_WITH_MORE_NT4_COMPAT_BINARIES) && $(KBUILD_TARGET_ARCH) == "x86"
  TEMPLATE_VBoxR3RuntimeDllNonPedantic_CFLAGS   = $(filter-out -MD$(VBOX_VCC_CRT_TYPE), $(TEMPLATE_VBoxR3DllNonPedantic_CFLAGS)) -MT$(VBOX_VCC_CRT_TYPE)
  TEMPLATE_VBoxR3RuntimeDllNonPedantic_CXXFLAGS = $(filter-out -MD$(VBOX_VCC_CRT_TYPE), $(TEMPLATE_VBoxR3DllNonPedantic_CXXFLAGS)) -MT$(VBOX_VCC_CRT_TYPE)
  TEMPLATE_VBoxR3RuntimeDllNonPedantic_PCHFLAGS = $(filter-out -MD$(VBOX_VCC_CRT_TYPE), $(TEMPLATE_VBoxR3DllNonPedantic_PCHFLAGS)) -MT$(VBOX_VCC_CRT_TYPE)
+endif
+
+#
+# Template for building libraries that are linked into VBoxRT-x86.dll
+# and it's variations, non-pedantic variation.
+#
+TEMPLATE_VBoxR3RuntimeDllNonPedantic-x86 = For libraries that are linked into VBoxRT, but must be excluded from -pedantic warnings.
+TEMPLATE_VBoxR3RuntimeDllNonPedantic-x86_EXTENDS      := VBoxR3DllNonPedantic-x86
+TEMPLATE_VBoxR3RuntimeDllNonPedantic-x86_BLD_TRG_ARCH := x86
+TEMPLATE_VBoxR3RuntimeDllNonPedantic-x86_DEFS      = $(TEMPLATE_VBoxR3DllNonPedantic-x86_DEFS) IN_RT_R3
+if defined(VBOX_WITH_MORE_NT4_COMPAT_BINARIES) && $(KBUILD_TARGET_ARCH) == "x86"
+ TEMPLATE_VBoxR3RuntimeDllNonPedantic-x86_CFLAGS   = $(filter-out -MD$(VBOX_VCC_CRT_TYPE), $(TEMPLATE_VBoxR3DllNonPedantic-x86_CFLAGS)) -MT$(VBOX_VCC_CRT_TYPE)
+ TEMPLATE_VBoxR3RuntimeDllNonPedantic-x86_CXXFLAGS = $(filter-out -MD$(VBOX_VCC_CRT_TYPE), $(TEMPLATE_VBoxR3DllNonPedantic-x86_CXXFLAGS)) -MT$(VBOX_VCC_CRT_TYPE)
+ TEMPLATE_VBoxR3RuntimeDllNonPedantic-x86_PCHFLAGS = $(filter-out -MD$(VBOX_VCC_CRT_TYPE), $(TEMPLATE_VBoxR3DllNonPedantic-x86_PCHFLAGS)) -MT$(VBOX_VCC_CRT_TYPE)
 endif
 

trunk/src/libs/liblzma-5.4.1/Makefile.kmk

@@ -30 +30 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-LIBRARIES += VBox-liblzma VBox-liblzma-static
-VBox-liblzma_TEMPLATE = VBoxR3RuntimeDllNonPedantic
-VBox-liblzma_CFLAGS.linux   = -std=gnu99
-VBox-liblzma_CFLAGS.solaris = -std=gnu99
-VBox-liblzma_CFLAGS.darwin  = -std=gnu99
-VBox-liblzma_CFLAGS.os2     = -std=gnu99
-VBox-liblzma_INCS += \
+LIBRARIES += VBox-liblzma
+VBox-liblzma_TEMPLATE       := VBoxR3RuntimeDllNonPedantic
+VBox-liblzma_CFLAGS.linux   := -std=gnu99
+VBox-liblzma_CFLAGS.solaris := -std=gnu99
+VBox-liblzma_CFLAGS.darwin  := -std=gnu99
+VBox-liblzma_CFLAGS.os2     := -std=gnu99
+VBox-liblzma_INCS           := \
         api \
         common \
@@ -46 +46 @@
         simple \
         vbox
-VBox-liblzma_DEFS = \
-        IN_RT \
+VBox-liblzma_DEFS := \
         TUKLIB_SYMBOL_PREFIX=lzma_ \
         ASSUME_RAM=128 \
@@ -82 +81 @@
         HAVE_STDBOOL_H=1 \
         NDEBUG=1
-VBox-liblzma_DEFS.amd64 += \
+VBox-liblzma_DEFS.amd64 := \
         SIZEOF_SIZE_T=8
-VBox-liblzma_DEFS.arm64 += \
+VBox-liblzma_DEFS.arm64 := \
         SIZEOF_SIZE_T=8
-VBox-liblzma_DEFS.x86 += \
+VBox-liblzma_DEFS.x86 := \
         SIZEOF_SIZE_T=4
-VBox-liblzma_SOURCES = \
+VBox-liblzma_SOURCES := \
         common/common.c \
         common/block_util.c \
@@ -168 +167 @@
         simple/sparc.c
 
-VBox-liblzma-static_TEMPLATE = VBoxR3StaticNonPedantic
-VBox-liblzma-static_DEFS = $(VBox-liblzma_DEFS)
-VBox-liblzma-static_INCS = $(VBox-liblzma_INCS)
-VBox-liblzma-static_CFLAGS.linux   = $(VBox-liblzma_CFLAGS.linux)
-VBox-liblzma-static_CFLAGS.solaris = $(VBox-liblzma_CFLAGS.solaris)
-VBox-liblzma-static_CFLAGS.darwin  = $(VBox-liblzma_CFLAGS.darwin)
-VBox-liblzma-static_CFLAGS.os2     = $(VBox-liblzma_CFLAGS.os2)
-ifdef VBOX_WITH_NOCRT_STATIC
- VBox-liblzma-static_DEFS += IPRT_NO_CRT_FOR_3RD_PARTY
-endif
-VBox-liblzma-static_SOURCES = $(VBox-liblzma_SOURCES)
 
 ifdef VBOX_WITH_32_ON_64_MAIN_API # 32-bit edition.
  LIBRARIES += VBox-liblzma-x86
- VBox-liblzma-x86_TEMPLATE = VBoxR3DllNonPedantic-x86
- VBox-liblzma-x86_EXTENDS = VBox-liblzma
+ VBox-liblzma-x86_TEMPLATE := VBoxR3RuntimeDllNonPedantic-x86
+ VBox-liblzma-x86_EXTENDS  := VBox-liblzma
+endif
+
+
+LIBRARIES += VBox-liblzma-static
+VBox-liblzma-static_TEMPLATE := VBoxR3StaticNonPedantic
+VBox-liblzma-static_EXTENDS  := VBox-liblzma
+ifdef VBOX_WITH_NOCRT_STATIC
+ VBox-liblzma-static_DEFS     = $(VBox-liblzma_DEFS) IPRT_NO_CRT_FOR_3RD_PARTY
 endif
 

trunk/src/libs/libxml2-2.12.6/Makefile.kmk

@@ -95 +95 @@
 ifdef VBOX_WITH_32_ON_64_MAIN_API # 32-bit edition.
  LIBRARIES += VBox-libxml2-x86
- VBox-libxml2-x86_TEMPLATE = VBoxR3DllNonPedantic-x86
+ VBox-libxml2-x86_TEMPLATE = VBoxR3RuntimeDllNonPedantic-x86
  VBox-libxml2-x86_EXTENDS = VBox-libxml2
 endif