Changeset 106683 in vbox for trunk/src

Timestamp:

Oct 25, 2024 10:28:28 AM (6 months ago)

Author:

vboxsync

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

165553

Message:

/Config.kmk,*.kmk: Changed the LIBS properties on all templates to LATE_LIBS to help solve library ordering issues. Only tested on win.amd64. jiraref:1253

Location:

trunk/src

Files:

• VBox/Additions/3D/Config.kmk (modified) (1 diff)
• VBox/Additions/os2/Config.kmk (modified) (1 diff)
• VBox/Devices/EFI/Firmware/Config.kmk (modified) (1 diff)
• VBox/HostDrivers/VBoxNetFlt/Makefile.kmk (modified) (1 diff)
• VBox/HostDrivers/VBoxUSB/win/Makefile.kmk (modified) (1 diff)
• VBox/Runtime/Makefile.kmk (modified) (1 diff)
• VBox/Storage/testcase/Makefile.kmk (modified) (2 diffs)
• VBox/ValidationKit/Config.kmk (modified) (6 diffs)
• VBox/ValidationKit/bootsectors/Config.kmk (modified) (2 diffs)
• libs/openssl-3.1.7/Config.kmk (modified) (1 diff)
• libs/softfloat-3e/testfloat/Makefile.kmk (modified) (1 diff)
• libs/xpcom18a4/Config.kmk (modified) (4 diffs)
• libs/xpcom18a4/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Additions/3D/Config.kmk

@@ -126 +126 @@
         $(VBOX_PATH_3D)/win/VBoxWddmUmHlp
 ifdef VBOX_WITH_NOCRT_STATIC # Only the softfloat libs are added here as mesa includes a softfloat.h and we wish for no conflicts.
- TEMPLATE_VBoxMesa3DGuestR3Dll_LIBS.x86 = \
-        $(filter-out $(VBOX_LIB_VBGL_R3_SHARED_X86),$(TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.x86)) \
+ TEMPLATE_VBoxMesa3DGuestR3Dll_LATE_LIBS.x86 = \
+        $(filter-out $(VBOX_LIB_VBGL_R3_SHARED_X86),$(TEMPLATE_NewerVccVBoxGuestR3Dll_LATE_LIBS.x86)) \
         $(VBOX_LIB_IPRT_GUEST_R3_SHARED_X86) \
         $(SDK_VBoxSoftFloatGuestR3Shared_LIBS.x86)
- TEMPLATE_VBoxMesa3DGuestR3Dll_LIBS.$(KBUILD_TARGET_ARCH) = \
-        $(filter-out $(VBOX_LIB_VBGL_R3_SHARED),$(TEMPLATE_NewerVccVBoxGuestR3Dll_LIBS.$(KBUILD_TARGET))) \
+ TEMPLATE_VBoxMesa3DGuestR3Dll_LATE_LIBS.$(KBUILD_TARGET_ARCH) = \
+        $(filter-out $(VBOX_LIB_VBGL_R3_SHARED),$(TEMPLATE_NewerVccVBoxGuestR3Dll_LATE_LIBS.$(KBUILD_TARGET))) \
         $(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
         $(SDK_VBoxSoftFloatGuestR3Shared_LIBS.$(KBUILD_TARGET_ARCH))

trunk/src/VBox/Additions/os2/Config.kmk

@@ -83 +83 @@
         $(PATH_DDKVIDEO)/rel/os2c/include/base/os2/16bit
 
-TEMPLATE_VBoxOs2Vac308_LIBS = \
+TEMPLATE_VBoxOs2Vac308_LATE_LIBS = \
         $(PATH_DDKVIDEO)/rel/os2c/lib/os2/os2386.lib \
         $(PATH_TOOL_VAC308_LIB)/cppon30.lib

trunk/src/VBox/Devices/EFI/Firmware/Config.kmk

@@ -160 +160 @@
         $(VBOX_PATH_EFI_FIRMWARE)/MdePkg/Include/AArch64
 
-TEMPLATE_VBoxEfiBldProg_LIBS = \
+TEMPLATE_VBoxEfiBldProg_LATE_LIBS = \
         $(VBOX_PATH_STAGE_EFI_BLDPROGS)/EfiBldCommonLib$(VBOX_SUFF_LIB) \
-        $(TEMPLATE_VBoxBldProg_LIBS)
+        $(TEMPLATE_VBoxBldProg_LATE_LIBS)
 ifn1of ($(KBUILD_HOST), win) # This stuff isn't up to our standard at all! :/
  TEMPLATE_VBoxEfiBldProg_CFLAGS = $(filter-out -pedantic,$(TEMPLATE_VBoxBldProg_CFLAGS)) \

trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk

@@ -276 +276 @@
   #
   TEMPLATE_VBoxNetFltR3 = Template for NetFltInstall, NetFltUninstall, NetAdpInstall, NetAdpUninstall, ++
-  TEMPLATE_VBoxNetFltR3_EXTENDS = VBoxR3Exe
-  TEMPLATE_VBoxNetFltR3_SDKS    = $(TEMPLATE_VBoxR3Exe_SDKS) ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBoxNtDll VBoxWinNewDevLib
-  TEMPLATE_VBoxNetFltR3_LIBS    = $(TEMPLATE_VBoxR3Exe_LIBS) \
+  TEMPLATE_VBoxNetFltR3_EXTENDS   = VBoxR3Exe
+  TEMPLATE_VBoxNetFltR3_SDKS      = $(TEMPLATE_VBoxR3Exe_SDKS) ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBoxNtDll VBoxWinNewDevLib
+  TEMPLATE_VBoxNetFltR3_LATE_LIBS = $(TEMPLATE_VBoxR3Exe_LATE_LIBS) \
         $(WinNetConfigExe_1_TARGET) \
         $(PATH_STAGE_LIB)/VBoxDrvCfgExe$(VBOX_SUFF_LIB) \

trunk/src/VBox/HostDrivers/VBoxUSB/win/Makefile.kmk

@@ -130 +130 @@
 #
 TEMPLATE_VBoxUsbR3 = Template for USBInstalls, USBUninstall and USBTest
-TEMPLATE_VBoxUsbR3_EXTENDS  = VBoxR3Exe
-TEMPLATE_VBoxUsbR3_SDKS     = $(TEMPLATE_VBoxR3Exe_SDKS) ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBoxWinNewDevLib
-TEMPLATE_VBoxUsbR3_CXXFLAGS = $(TEMPLATE_VBoxR3Exe_CXXFLAGS) -Gz
-TEMPLATE_VBoxUsbR3_CFLAGS   = $(TEMPLATE_VBoxR3Exe_CFLAGS) -Gz
-TEMPLATE_VBoxUsbR3_LIBS     = $(TEMPLATE_VBoxR3Exe_LIBS) \
+TEMPLATE_VBoxUsbR3_EXTENDS   = VBoxR3Exe
+TEMPLATE_VBoxUsbR3_SDKS      = $(TEMPLATE_VBoxR3Exe_SDKS) ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBoxWinNewDevLib
+TEMPLATE_VBoxUsbR3_CXXFLAGS  = $(TEMPLATE_VBoxR3Exe_CXXFLAGS) -Gz
+TEMPLATE_VBoxUsbR3_CFLAGS    = $(TEMPLATE_VBoxR3Exe_CFLAGS) -Gz
+TEMPLATE_VBoxUsbR3_LATE_LIBS = $(TEMPLATE_VBoxR3Exe_LATE_LIBS) \
         $(PATH_STAGE_LIB)/VBoxDrvCfgExe$(VBOX_SUFF_LIB) \
         $(LIB_RUNTIME)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -3054 +3054 @@
  TEMPLATE_VBoxR3RuntimeDllItself = xx
  TEMPLATE_VBoxR3RuntimeDllItself_EXTENDS = VBoxR3RuntimeDll
- TEMPLATE_VBoxR3RuntimeDllItself_LIBS.win.x86 = \
-        $(filter-out $(PATH_STAGE_LIB)/RuntimeR3VccTricks%, $(TEMPLATE_VBoxR3RuntimeDll_LIBS.win.x86))
+ TEMPLATE_VBoxR3RuntimeDllItself_LATE_LIBS.win.x86 = \
+        $(filter-out $(PATH_STAGE_LIB)/RuntimeR3VccTricks%, $(TEMPLATE_VBoxR3RuntimeDll_LATE_LIBS.win.x86))
  TEMPLATE_VBoxR3RuntimeDllItself_DEFS   += IN_RING3 VCC_FAKES_TARGET_$(VBOX_VCC_TOOL_STEM) VCC_FAKES_TARGET=$(substr $(VBOX_VCC_TOOL_STEM),-3)
  TEMPLATE_VBoxR3RuntimeDllItself_SOURCES = \

trunk/src/VBox/Storage/testcase/Makefile.kmk

@@ -163 +163 @@
   if1of ($(KBUILD_TARGET), os2 win)
    vbox-img_LIBS += \
-        $(SDK_VBoxLzf_STATIC_LIBS) \
+        $(SDK_VBoxLzfStatic_LIBS) \
         $(SDK_VBoxZlibStatic_LIBS)
   else
@@ -213 +213 @@
  if1of ($(KBUILD_TARGET), os2 win)
   vdkeystoremgr_LIBS += \
-        $(SDK_VBoxLzf_STATIC_LIBS) \
+        $(SDK_VBoxLzfStatic_LIBS) \
         $(SDK_VBoxZlibStatic_LIBS)
  else

trunk/src/VBox/ValidationKit/Config.kmk

@@ -53 +53 @@
 #
 TEMPLATE_VBoxValidationKitR3Base = VBox Validation Kit ring-3 program base, both guest and host.
-TEMPLATE_VBoxValidationKitR3Base_EXTENDS = VBoxR3Static
+TEMPLATE_VBoxValidationKitR3Base_EXTENDS          = VBoxR3Static
 ifeq ($(KBUILD_TARGET),win)
  TEMPLATE_VBoxValidationKitR3Base_LDFLAGS         = $(filter-out -IntegrityCheck, $(TEMPLATE_VBoxR3Static_LDFLAGS))
@@ -62 +62 @@
  TEMPLATE_VBoxValidationKitR3Base_LDFLAGS         = $(filter-out -static, $(TEMPLATE_VBoxR3Static_LDFLAGS))
 endif
-TEMPLATE_VBoxValidationKitR3Base_DEFS = $(filter-out VBOX_WITH_DTRACE,$(TEMPLATE_VBoxR3Static_DEFS))
-TEMPLATE_VBoxValidationKitR3Base_LIBS = $(TEMPLATE_VBoxR3Static_LIBS)
+TEMPLATE_VBoxValidationKitR3Base_DEFS             = $(filter-out VBOX_WITH_DTRACE,$(TEMPLATE_VBoxR3Static_DEFS))
+TEMPLATE_VBoxValidationKitR3Base_LATE_LIBS        = $(TEMPLATE_VBoxR3Static_LATE_LIBS)
 if1of ($(KBUILD_TARGET), linux)
  if $(VBOX_GCC_VERSION_CXX) < 40800
-  TEMPLATE_VBoxValidationKitR3Base_LIBS += supc++
-  TEMPLATE_VBoxValidationKitR3Base_LDTOOL = $(subst GXX,GCC,$(TEMPLATE_VBoxR3Static_TOOL))
- endif
-endif
-TEMPLATE_VBoxValidationKitR3Base_LDFLAGS.darwin = $(TEMPLATE_VBoxR3Static_LDFLAGS.darwin) -framework IOKit
+  TEMPLATE_VBoxValidationKitR3Base_LATE_LIBS     += supc++
+  TEMPLATE_VBoxValidationKitR3Base_LDTOOL         = $(subst GXX,GCC,$(TEMPLATE_VBoxR3Static_TOOL))
+ endif
+endif
+TEMPLATE_VBoxValidationKitR3Base_LDFLAGS.darwin   = $(TEMPLATE_VBoxR3Static_LDFLAGS.darwin) -framework IOKit
 
 
@@ -83 +83 @@
 TEMPLATE_VBoxValidationKitR3_SDKS.win = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBoxNtDll
 TEMPLATE_VBoxValidationKitR3_DEFS = IN_RT_R3
-TEMPLATE_VBoxValidationKitR3_LIBS.darwin = iconv
-TEMPLATE_VBoxValidationKitR3_LIBS.freebsd = iconv
-TEMPLATE_VBoxValidationKitR3_LIBS = \
+TEMPLATE_VBoxValidationKitR3_LATE_LIBS.darwin = iconv
+TEMPLATE_VBoxValidationKitR3_LATE_LIBS.freebsd = iconv
+TEMPLATE_VBoxValidationKitR3_LATE_LIBS = \
         $(PATH_STAGE_LIB)/RuntimeR3$(VBOX_SUFF_LIB)
 ifeq ($(KBUILD_TARGET),solaris)
- TEMPLATE_VBoxValidationKitR3_LIBS += \
+ TEMPLATE_VBoxValidationKitR3_LATE_LIBS += \
         kstat \
         nsl \
         contract
  if1of ($(KBUILD_TARGET_ARCH), amd64 x86)
-  TEMPLATE_VBoxValidationKitR3_LIBS += \
+  TEMPLATE_VBoxValidationKitR3_LATE_LIBS += \
         smbios
  endif
 endif
 ifneq ($(KBUILD_TARGET),win)
- TEMPLATE_VBoxValidationKitR3_LIBS += \
+ TEMPLATE_VBoxValidationKitR3_LATE_LIBS += \
         $(SDK_VBoxZlib_LIBS)
 endif
@@ -104 +104 @@
 # Make VCC100 output work on NT3.x, NT4, W2K, XP and W2K3.
 ifndef VBOX_WITH_NOCRT_STATIC
- TEMPLATE_VBoxValidationKitR3_LIBS.win.x86 = \
+ TEMPLATE_VBoxValidationKitR3_LATE_LIBS.win.x86 = \
         $(PATH_TOOL_$(TEMPLATE_VBoxValidationKitR3_TOOL.win.x86)_LIB)/oldnames.lib \
         $(PATH_TOOL_$(TEMPLATE_VBoxValidationKitR3_TOOL.win.x86)_LIB)/libcmt$(VBOX_VCC_CRT_TYPE).lib \
@@ -147 +147 @@
 TEMPLATE_VBoxValidationKitR3SupDrv_EXTENDS_BY = appending
 TEMPLATE_VBoxValidationKitR3SupDrv_DEFS = IN_SUP_R3
-TEMPLATE_VBoxValidationKitR3SupDrv_LIBS = \
+TEMPLATE_VBoxValidationKitR3SupDrv_LATE_LIBS = \
         $(PATH_STAGE_LIB)/SUPR3Static$(VBOX_SUFF_LIB) \
         $(PATH_STAGE_LIB)/RuntimeR3$(VBOX_SUFF_LIB)
@@ -164 +164 @@
 TEMPLATE_VBoxValidationKitR0_INST = $(INST_VALIDATIONKIT)$(KBUILD_TARGET)/$(KBUILD_TARGET_ARCH)/
 TEMPLATE_VBoxValidationKitR0_DEFS = IN_RT_R0
-TEMPLATE_VBoxValidationKitR0_LIBS = \
+TEMPLATE_VBoxValidationKitR0_LATE_LIBS = \
         $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB) \
         $(VBOX_LIB_SUPR0)

trunk/src/VBox/ValidationKit/bootsectors/Config.kmk

@@ -789 +789 @@
         $(eval .PRECIOUS: $(outbase).map) # ugly hack!
 
-TEMPLATE_VBoxBS3KitImg_LIBS = \
+TEMPLATE_VBoxBS3KitImg_LATE_LIBS = \
         $(PATH_OBJ)/bs3kit-common-16/bs3kit-common-16.lib \
         $(PATH_OBJ)/bs3kit-common-32/bs3kit-common-32.lib \
@@ -895 +895 @@
         disable 1014, 1080
 
-TEMPLATE_VBoxBS3KitHighImg_LIBS = \
+TEMPLATE_VBoxBS3KitHighImg_LATE_LIBS = \
         $(PATH_OBJ)/bs3kit-common-16/bs3kit-common-16-implib.lib \
         $(PATH_OBJ)/bs3kit-common-32/bs3kit-common-32-implib.lib \

trunk/src/libs/openssl-3.1.7/Config.kmk

@@ -376 +376 @@
  TEMPLATE_LibCryptoTstExe_CFLAGS = $(filter-out $(VBOX_GCC_PEDANTIC_C), $(TEMPLATE_VBoxR3TstExe_CFLAGS)) $(VBOX_GCC_NON_PEDANTIC_C)
 endif
-TEMPLATE_LibCryptoTstExe_LIBS    = $(PATH_STAGE_LIB)/VBox-libcrypto$(VBOX_SUFF_LIB) $(TEMPLATE_VBoxR3TstExe_LIBS)
+TEMPLATE_LibCryptoTstExe_LATE_LIBS = $(PATH_STAGE_LIB)/VBox-libcrypto$(VBOX_SUFF_LIB) $(TEMPLATE_VBoxR3TstExe_LATE_LIBS)
 
 

trunk/src/libs/softfloat-3e/testfloat/Makefile.kmk

@@ -62 +62 @@
 #
 TEMPLATE_VBoxTestFloatExe = Template for building SoftFloat-3e programs.
-TEMPLATE_VBoxTestFloatExe_EXTENDS = VBoxTestFloat
-TEMPLATE_VBoxTestFloatExe_INST    = $(INST_TESTCASE)
-TEMPLATE_VBoxTestFloatExe_LIBS    = \
+TEMPLATE_VBoxTestFloatExe_EXTENDS   = VBoxTestFloat
+TEMPLATE_VBoxTestFloatExe_INST      = $(INST_TESTCASE)
+TEMPLATE_VBoxTestFloatExe_LATE_LIBS = \
         $(VBox-TestFloat_1_TARGET) \
-        $(TEMPLATE_VBoxTestFloat_LIBS)
+        $(TEMPLATE_VBoxTestFloat_LATE_LIBS)
 
 # -wd4098: testfloat.c(438): warning C4098: 'subjFunction_az_extF80_rx': 'void' function returning a value

trunk/src/libs/xpcom18a4/Config.kmk

@@ -165 +165 @@
 
 # When using IPRT in NSRP or/and using IPRT for logging, link with IPRT.
-TEMPLATE_XPComDll_LIBS               += $(LIB_RUNTIME)
+TEMPLATE_XPComDll_LATE_LIBS          += $(LIB_RUNTIME)
 
 
@@ -182 +182 @@
         $(VBOX_PATH_SDK)/bindings/xpcom/include/ipcd \
         .
-TEMPLATE_XPComExe_LIBS             = \
+TEMPLATE_XPComExe_LATE_LIBS        = \
         $(VBox-xpcom-ipcshared_1_TARGET) \
         $(VBoxXPCOM_1_TARGET) \
-        $(TEMPLATE_XPComDll_LIBS)
-TEMPLATE_XPComExe_LIBS.freebsd     = $(LIB_PTHREAD)
-TEMPLATE_XPComExe_LIBS.linux       = dl $(LIB_PTHREAD)
+        $(TEMPLATE_XPComDll_LATE_LIBS)
+TEMPLATE_XPComExe_LATE_LIBS.freebsd = $(LIB_PTHREAD)
+TEMPLATE_XPComExe_LATE_LIBS.linux  = dl $(LIB_PTHREAD)
 TEMPLATE_XPComExe_LDFLAGS.darwin   = -bind_at_load $(filter-out -current_version -compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD),$(TEMPLATE_XPComDll_LDFLAGS.darwin))
 
@@ -233 +233 @@
 TEMPLATE_XPComBldProg_LDFLAGS.darwin     = $(TEMPLATE_VBoxAdvBldProg_LDFLAGS.darwin)      -fpascal-strings -fshort-wchar -fno-rtti -fno-exceptions
 TEMPLATE_XPComBldProg_ORDERDEPS          = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $($(hdrinst)_1_TARGET))
-TEMPLATE_XPComBldProg_LIBS.darwin        = \
+TEMPLATE_XPComBldProg_LATE_LIBS.darwin   = \
         iconv
 
@@ -255 +255 @@
 TEMPLATE_XPComDll-x86_BLD_TRG_ARCH     = x86
 TEMPLATE_XPComDll-x86_DEFS             = $(TEMPLATE_XPComDll_DEFS) VBOX_IN_32_ON_64_MAIN_API
-TEMPLATE_XPComDll-x86_LIBS             = $(subst $(LIB_RUNTIME),$(VBOX_LIB_RUNTIME_X86),$(TEMPLATE_XPComDll_LIBS))
+TEMPLATE_XPComDll-x86_LATE_LIBS        = $(subst $(LIB_RUNTIME),$(VBOX_LIB_RUNTIME_X86),$(TEMPLATE_XPComDll_LATE_LIBS))
 
 

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -764 +764 @@
  TEMPLATE_XPComIpcDll_DEFS           += IPC_LOGGING
 endif
-TEMPLATE_XPComIpcDll_LIBS             = $(VBoxXPCOM_1_TARGET) $(TEMPLATE_XPComDll_LIBS)
+TEMPLATE_XPComIpcDll_LATE_LIBS        = $(VBoxXPCOM_1_TARGET) $(TEMPLATE_XPComDll_LATE_LIBS)
 ifneq ($(KBUILD_TARGET),win)
  ifeq ($(filter-out solaris.x86 %.amd64 %.sparc32 %.sparc64,$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),) ## TODO: cleanup!
@@ -780 +780 @@
 TEMPLATE_XPComIpcDll-x86_EXTENDS      = XPComIpcDll
 TEMPLATE_XPComIpcDll-x86_BLD_TRG_ARCH = x86
-TEMPLATE_XPComIpcDll-x86_LIBS         = $(VBoxXPCOM-x86_1_TARGET) $(TEMPLATE_XPComDll-x86_LIBS)
+TEMPLATE_XPComIpcDll-x86_LATE_LIBS    = $(VBoxXPCOM-x86_1_TARGET) $(TEMPLATE_XPComDll-x86_LATE_LIBS)
 
 TEMPLATE_XPComIpcExe               = XPCOM IPC executables
@@ -836 +836 @@
         $(VBox-xpcom-ipcshared_1_TARGET) \
         $(VBoxXPCOM_1_TARGET) \
-        $(TEMPLATE_XPComDll_LIBS)
+        $(TEMPLATE_XPComDll_LATE_LIBS)