Changeset 106688 in vbox

Timestamp:

Oct 25, 2024 11:09:46 AM (3 months ago)

Author:

vboxsync

Message:

/Config.kmk,*.kmk: The VBoxZlib SDK must use LATE_LIBS instead of LIBS to avoid linking ordering problems on linux. jiraref:VBP-1253

Location:

trunk

Files:

• Config.kmk (modified) (4 diffs)
• src/VBox/Runtime/Makefile.kmk (modified) (2 diffs)
• src/VBox/Storage/testcase/Makefile.kmk (modified) (4 diffs)
• src/VBox/ValidationKit/Config.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -5325 +5325 @@
 if1of ($(KBUILD_TARGET), os2 solaris win)
  SDK_VBoxZlib_INCS            ?= $(PATH_ROOT)/src/libs/zlib-1.2.13
- SDK_VBoxZlib_LIBS            ?= $(PATH_STAGE_LIB)/VBox-zlib$(VBOX_SUFF_LIB)
+ SDK_VBoxZlib_LATE_LIBS       ?= $(PATH_STAGE_LIB)/VBox-zlib$(VBOX_SUFF_LIB)
 else
  SDK_VBoxZlib_INCS            ?=
- SDK_VBoxZlib_LIBS            ?= z
+ SDK_VBoxZlib_LATE_LIBS       ?= z
  SDK_VBoxZlib_DEFS.linux      ?= _LARGEFILE64_SOURCE
 endif
@@ -5335 +5335 @@
 SDK_VBoxZlib-x86_EXTENDS       = VBoxZlib
 if1of ($(KBUILD_TARGET), os2 solaris win)
- SDK_VBoxZlib_LIBS-x86        ?= $(PATH_STAGE_LIB)/VBox-zlib-x86$(VBOX_SUFF_LIB)
-endif
-
-SDK_VBoxZlibStatic           := zlib for static linking
-SDK_VBoxZlibStatic_EXTENDS   := VBoxZlib
+ SDK_VBoxZlib-x86_LIBS        ?= $(PATH_STAGE_LIB)/VBox-zlib-x86$(VBOX_SUFF_LIB)
+endif
+
+SDK_VBoxZlibStatic            := zlib for static linking
+SDK_VBoxZlibStatic_EXTENDS    := VBoxZlib
 if1of ($(KBUILD_TARGET), os2 win) # Not required on solaris.
- SDK_VBoxZlibStatic_LIBS        ?= $(PATH_STAGE_LIB)/VBox-zlib-static$(VBOX_SUFF_LIB)
+ SDK_VBoxZlibStatic_LATE_LIBS ?= $(PATH_STAGE_LIB)/VBox-zlib-static$(VBOX_SUFF_LIB)
 endif
 
@@ -6900 +6900 @@
  TEMPLATE_VBoxR3Static_LATE_LIBS.$(KBUILD_TARGET_ARCH) += \
         $(SDK_VBoxLzfStatic_LIBS) \
-        $(SDK_VBoxZlibStatic_LIBS) \
+        $(SDK_VBoxZlibStatic_LATE_LIBS) \
         $(SDK_VBoxLibLzmaStatic_LIBS)
 else
  TEMPLATE_VBoxR3Static_LATE_LIBS.$(KBUILD_TARGET_ARCH) += \
         $(SDK_VBoxLzf_LIBS) \
-        $(SDK_VBoxZlib_LIBS) \
+        $(SDK_VBoxZlib_LATE_LIBS) \
         $(SDK_VBoxLibLzma_LIBS)
  if1of ($(KBUILD_TARGET), darwin freebsd)
@@ -7192 +7192 @@
                 $(if-expr !defined(SDK_VBoxLibXml2_LIBS),$(PATH_STAGE_LIB)/VBox-libxml2-static$(VBOX_SUFF_LIB),) \
         $(if-expr "$(KBUILD_TARGET)" == "win" || "$(KBUILD_TARGET)" == "os2" \
-                ,$(SDK_VBoxLzfStatic_LIBS) $(SDK_VBoxZlibStatic_LIBS) $(SDK_VBoxLibLzmaStatic_LIBS) \
-                ,$(SDK_VBoxLzf_LIBS) $(SDK_VBoxZlib_LIBS) $(SDK_VBoxLibLzma_LIBS)) \
+                ,$(SDK_VBoxLzfStatic_LIBS) $(SDK_VBoxZlibStatic_LATE_LIBS) $(SDK_VBoxLibLzmaStatic_LIBS) \
+                ,$(SDK_VBoxLzf_LIBS) $(SDK_VBoxZlib_LATE_LIBS) $(SDK_VBoxLibLzma_LIBS)) \
         ,$(TEMPLATE_$(TEMPLATE_VBoxR3AutoTest_EXTENDS)_LATE_LIBS.$(KBUILD_TARGET_ARCH)))
 

trunk/src/VBox/Runtime/Makefile.kmk

@@ -2993 +2993 @@
 endif
 VBoxRT_LIBS                   += \
-        $(SDK_VBoxZlib_LIBS)
+        $(SDK_VBoxZlib_LATE_LIBS)
 ifndef SDK_VBoxOpenSslStatic_LIBS
  VBoxRT_LIBS                  += \
@@ -3155 +3155 @@
 endif
 VBoxRT-x86_LIBS                  += \
-        $(SDK_VBoxZlib_LIBS-x86)
+        $(SDK_VBoxZlib-x86_LIBS)
 ifndef SDK_VBoxOpenSslStatic_LIBS
  VBoxRT-x86_LIBS                 += \

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

@@ -159 +159 @@
 
  else
+  if1of ($(KBUILD_TARGET), os2 win)
+   vbox-img_SDKS := VBoxZlibStatic VBoxLzfStatic
+  else
+   vbox-img_SDKS := VBoxZlib VBoxLzf
+  endif
+  vbox-img_SDKS.win := VBoxNtDll
   vbox-img_LIBS = \
         $(VBOX_LIB_RUNTIME_STATIC)
-  if1of ($(KBUILD_TARGET), os2 win)
-   vbox-img_LIBS += \
-        $(SDK_VBoxLzfStatic_LIBS) \
-        $(SDK_VBoxZlibStatic_LIBS)
-  else
-   vbox-img_LIBS += \
-        $(SDK_VBoxLzf_LIBS) \
-        $(SDK_VBoxZlib_LIBS)
-  endif
   ifeq ($(KBUILD_TARGET),linux)
    ifdef SDK_VBoxLibXml2_LIBS
@@ -181 +178 @@
   else ifeq ($(KBUILD_TARGET),darwin)
    vbox-img_LIBS += iconv
-  else ifeq ($(KBUILD_TARGET),win)
-   vbox-img_SDKS.win = VBoxNtDll
   else ifeq ($(KBUILD_TARGET),solaris)
    vbox-img_LIBS += kstat efi
@@ -203 +198 @@
  vdkeystoremgr_TEMPLATE = VBoxR3Static
  vdkeystoremgr_DEFS += IN_VBOXDDU IN_VBOXDDU_STATIC VBOX_HDD_NO_DYNAMIC_BACKENDS
+ if1of ($(KBUILD_TARGET), os2 win)
+  vdkeystoremgr_SDKS = VBoxZlibStatic
+ else
+  vdkeystoremgr_SDKS = VBoxZlib
+ endif
  vdkeystoremgr_SOURCES = \
         vdkeystoremgr.cpp \
@@ -211 +211 @@
         $(VBOX_LIB_RUNTIME_STATIC) \
         $(PATH_STAGE_LIB)/SUPR3$(VBOX_SUFF_LIB)
- if1of ($(KBUILD_TARGET), os2 win)
-  vdkeystoremgr_LIBS += \
-        $(SDK_VBoxLzfStatic_LIBS) \
-        $(SDK_VBoxZlibStatic_LIBS)
- else
-  vdkeystoremgr_LIBS += \
-        $(SDK_VBoxLzf_LIBS) \
-        $(SDK_VBoxZlib_LIBS)
- endif
  ifeq ($(KBUILD_TARGET),linux)
   ifdef SDK_VBoxLibXml2_LIBS

trunk/src/VBox/ValidationKit/Config.kmk

@@ -99 +99 @@
 ifneq ($(KBUILD_TARGET),win)
  TEMPLATE_VBoxValidationKitR3_LATE_LIBS += \
-        $(SDK_VBoxZlib_LIBS)
+        $(SDK_VBoxZlib_LATE_LIBS)
 endif