Changeset 98240 in vbox

Timestamp:

Jan 23, 2023 12:25:10 PM (2 years ago)

Author:

vboxsync

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

155434

Message:

*.kmk,configure*: s/VBOX_LZF/VBoxLzf/ (SDK) bugref:10348

Location:

trunk

Files:

• Config.kmk (modified) (3 diffs)
• configure (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (3 diffs)
• src/VBox/Storage/testcase/Makefile.kmk (modified) (2 diffs)
• src/libs/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -4909 +4909 @@
 
 # lzf
-SDK_VBOX_LZF                   := lzf compressor/decompressor for dll linking.
-SDK_VBOX_LZF_INCS              ?= $(PATH_ROOT)/src/libs/liblzf-3.6
-SDK_VBOX_LZF_LIBS              ?= $(PATH_STAGE_LIB)/VBox-liblzf$(VBOX_SUFF_LIB)
-
-SDK_VBOX_LZF-x86               := lzf/x86 compressor/decompressor for dll linking.
-SDK_VBOX_LZF-x86_EXTENDS       := VBOX_LZF
-SDK_VBOX_LZF_LIBS-x86          ?= $(PATH_STAGE_LIB)/VBox-liblzf-x86$(VBOX_SUFF_LIB)
-
-SDK_VBOX_LZF_STATIC            := lzf compressor/decompressor for static linking.
-SDK_VBOX_LZF_STATIC_EXTENDS    := VBOX_LZF
+SDK_VBoxLzf                   := lzf compressor/decompressor for dll linking.
+SDK_VBoxLzf_INCS              ?= $(PATH_ROOT)/src/libs/liblzf-3.6
+SDK_VBoxLzf_LIBS              ?= $(PATH_STAGE_LIB)/VBox-liblzf$(VBOX_SUFF_LIB)
+
+SDK_VBoxLzf-x86               := lzf/x86 compressor/decompressor for dll linking.
+SDK_VBoxLzf-x86_EXTENDS       := VBoxLzf
+SDK_VBoxLzf_LIBS-x86          ?= $(PATH_STAGE_LIB)/VBox-liblzf-x86$(VBOX_SUFF_LIB)
+
+SDK_VBoxLzf_STATIC            := lzf compressor/decompressor for static linking.
+SDK_VBoxLzf_STATIC_EXTENDS    := VBoxLzf
 if1of ($(KBUILD_TARGET), os2 win)
- SDK_VBOX_LZF_STATIC_LIBS      := $(PATH_STAGE_LIB)/VBox-liblzf-static$(VBOX_SUFF_LIB)
+ SDK_VBoxLzf_STATIC_LIBS      := $(PATH_STAGE_LIB)/VBox-liblzf-static$(VBOX_SUFF_LIB)
 endif
 
@@ -6594 +6594 @@
 if1of ($(KBUILD_TARGET), os2 win)
  TEMPLATE_VBoxR3Static_LIBS.$(KBUILD_TARGET_ARCH) += \
-        $(SDK_VBOX_LZF_STATIC_LIBS) \
+        $(SDK_VBoxLzf_STATIC_LIBS) \
         $(SDK_VBOX_ZLIB_STATIC_LIBS)
 else
  TEMPLATE_VBoxR3Static_LIBS.$(KBUILD_TARGET_ARCH) += \
-        $(SDK_VBOX_LZF_LIBS) \
+        $(SDK_VBoxLzf_LIBS) \
         $(SDK_VBOX_ZLIB_LIBS)
  if1of ($(KBUILD_TARGET),darwin freebsd)
@@ -6881 +6881 @@
         $(if-expr !defined(SDK_VBOX_LIBXML2_LIBS),$(PATH_STAGE_LIB)/VBox-libxml2-static$(VBOX_SUFF_LIB),) \
         $(if-expr "$(KBUILD_TARGET)" == "win" || "$(KBUILD_TARGET)" == "os2" \
-                ,$(SDK_VBOX_LZF_STATIC_LIBS) $(SDK_VBOX_ZLIB_STATIC_LIBS) \
-               ,$(SDK_VBOX_LZF_LIBS) $(SDK_VBOX_ZLIB_LIBS)) \
+                ,$(SDK_VBoxLzf_STATIC_LIBS) $(SDK_VBOX_ZLIB_STATIC_LIBS) \
+               ,$(SDK_VBoxLzf_LIBS) $(SDK_VBOX_ZLIB_LIBS)) \
         ,$(TEMPLATE_$(TEMPLATE_VBoxR3AutoTest_EXTENDS)_LIBS.$(KBUILD_TARGET_ARCH)))
 

trunk/configure

@@ -991 +991 @@
     if test_execute; then
       echo "if1of (\$(KBUILD_TARGET),darwin freebsd haiku linux)" >> $CNF
-      cnf_append " SDK_VBOX_LZF_LIBS" "`strip_l "$LIBLZF"`"
-      cnf_append " SDK_VBOX_LZF_INCS" "$INCLZF"
+      cnf_append " SDK_VBoxLzf_LIBS" "`strip_l "$LIBLZF"`"
+      cnf_append " SDK_VBoxLzf_INCS" "$INCLZF"
       echo "endif" >> $CNF
     fi

trunk/src/VBox/Runtime/Makefile.kmk

@@ -358 +358 @@
         include \
         $(SDK_VBOX_ZLIB_INCS) \
-        $(SDK_VBOX_LZF_INCS)
+        $(SDK_VBoxLzf_INCS)
 
 # RuntimeBaseR3_INCS.solaris  = \
@@ -2854 +2854 @@
 VBoxRT_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) := $(RuntimeBaseR3_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
 VBoxRT_LIBS                    = \
-        $(SDK_VBOX_LZF_LIBS) \
+        $(SDK_VBoxLzf_LIBS) \
         $(PATH_STAGE_LIB)/SUPR3$(VBOX_SUFF_LIB)
 ifndef SDK_VBOX_LIBXML2_LIBS
@@ -3008 +3008 @@
 
 VBoxRT-x86_LIBS = \
-        $(SDK_VBOX_LZF_LIBS-x86)
+        $(SDK_VBoxLzf_LIBS-x86)
 if1of ($(KBUILD_TARGET_ARCH), amd64 x86)
 VBoxRT-x86_LIBS += \

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

@@ -163 +163 @@
   if1of ($(KBUILD_TARGET),os2 win)
    vbox-img_LIBS += \
-        $(SDK_VBOX_LZF_STATIC_LIBS) \
+        $(SDK_VBoxLzf_STATIC_LIBS) \
         $(SDK_VBOX_ZLIB_STATIC_LIBS)
   else
    vbox-img_LIBS += \
-        $(SDK_VBOX_LZF_LIBS) \
+        $(SDK_VBoxLzf_LIBS) \
         $(SDK_VBOX_ZLIB_LIBS)
   endif
@@ -213 +213 @@
  if1of ($(KBUILD_TARGET),os2 win)
   vdkeystoremgr_LIBS += \
-        $(SDK_VBOX_LZF_STATIC_LIBS) \
+        $(SDK_VBoxLzf_STATIC_LIBS) \
         $(SDK_VBOX_ZLIB_STATIC_LIBS)
  else
   vdkeystoremgr_LIBS += \
-        $(SDK_VBOX_LZF_LIBS) \
+        $(SDK_VBoxLzf_LIBS) \
         $(SDK_VBOX_ZLIB_LIBS)
  endif

trunk/src/libs/Makefile.kmk

@@ -65 +65 @@
 
 # liblzf is used by the IPRT compression code (saved state compression).
-if "$(SDK_VBOX_LZF_INCS)" == "$(PATH_ROOT)/src/libs/liblzf-3.6"
+if "$(SDK_VBoxLzf_INCS)" == "$(PATH_ROOT)/src/libs/liblzf-3.6"
  include $(PATH_SUB_CURRENT)/liblzf-3.6/Makefile.kmk
 endif