Changeset 98253 in vbox

Timestamp:

Jan 23, 2023 5:38:37 PM (2 years ago)

Author:

vboxsync

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

155452

Message:

*.kmk,configure*: s/VBOX_LIBXML2/VBoxLibXml2 (sdk) bugref:10348

Location:

trunk

Files:

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

trunk/Config.kmk

@@ -5042 +5042 @@
 
 # libxml2
-SDK_VBOX_LIBXML2               := libxml2 for dll linking.
-SDK_VBOX_LIBXML2_INCS          ?= $(PATH_ROOT)/src/libs/libxml2-2.9.14/include
-SDK_VBOX_LIBXML2_DEFS          ?= _REENTRANT LIBXML_STATIC LIBXML_STATIC_FOR_DLL
-SDK_VBOX_LIBXML2_DEFS.win      ?= WIN32 _WINDOWS _MBCS HAVE_WIN32_THREADS HAVE_COMPILER_TLS
+SDK_VBoXLibXml2               := libxml2 for dll linking.
+SDK_VBoXLibXml2_INCS          ?= $(PATH_ROOT)/src/libs/libxml2-2.9.14/include
+SDK_VBoXLibXml2_DEFS          ?= _REENTRANT LIBXML_STATIC LIBXML_STATIC_FOR_DLL
+SDK_VBoXLibXml2_DEFS.win      ?= WIN32 _WINDOWS _MBCS HAVE_WIN32_THREADS HAVE_COMPILER_TLS
 # Note: no linking to LIB here, we do that explicitly in src/VBox/Runtime/Makefile.kmk to link
 #       libxml against VBoxRT
@@ -6589 +6589 @@
         $(VBOX_LIB_RUNTIME_STATIC_X86)
 endif
-ifndef SDK_VBOX_LIBXML2_LIBS
+ifndef SDK_VBoXLibXml2_LIBS
  TEMPLATE_VBoxR3Static_LIBS.$(KBUILD_TARGET_ARCH) += \
         $(PATH_STAGE_LIB)/VBox-libxml2-static$(VBOX_SUFF_LIB)
@@ -6880 +6880 @@
 TEMPLATE_VBoxR3AutoTest_INST        = $(INST_TESTCASE)
 TEMPLATE_VBoxR3AutoTest_LIBS.$(KBUILD_TARGET_ARCH) = $(filter-out \
-        $(if-expr !defined(SDK_VBOX_LIBXML2_LIBS),$(PATH_STAGE_LIB)/VBox-libxml2-static$(VBOX_SUFF_LIB),) \
+        $(if-expr !defined(SDK_VBoXLibXml2_LIBS),$(PATH_STAGE_LIB)/VBox-libxml2-static$(VBOX_SUFF_LIB),) \
         $(if-expr "$(KBUILD_TARGET)" == "win" || "$(KBUILD_TARGET)" == "os2" \
                 ,$(SDK_VBoxLzf_STATIC_LIBS) $(SDK_VBOX_ZLIB_STATIC_LIBS) \

trunk/configure

@@ -733 +733 @@
         if test_compile "$LIBXML2 $LIBPTHREAD $I_INCXML2" xml2 xml2; then
           if test_execute; then
-            cnf_append "SDK_VBOX_LIBXML2_DEFS" "_REENTRANT" ## @todo get defines from --cflags
-            cnf_append "SDK_VBOX_LIBXML2_INCS" "$INCXML2"
-            cnf_append "SDK_VBOX_LIBXML2_LIBS" "`strip_l "$LIBXML2"`"
+            cnf_append "SDK_VBoXLibXml2_DEFS" "_REENTRANT" ## @todo get defines from --cflags
+            cnf_append "SDK_VBoXLibXml2_INCS" "$INCXML2"
+            cnf_append "SDK_VBoXLibXml2_LIBS" "`strip_l "$LIBXML2"`"
           fi
         fi
@@ -767 +767 @@
         if test_compile "$LIBXML2 $LIBPTHREAD $I_INCXML2" xml2 xml2; then
           if test_execute; then
-            cnf_append "SDK_VBOX_LIBXML2_DEFS" "_REENTRANT" ## @todo get defines from --cflags
-            cnf_append "SDK_VBOX_LIBXML2_INCS" "$INCXML2"
-            cnf_append "SDK_VBOX_LIBXML2_LIBS" "`strip_l "$LIBXML2"`"
+            cnf_append "SDK_VBoXLibXml2_DEFS" "_REENTRANT" ## @todo get defines from --cflags
+            cnf_append "SDK_VBoXLibXml2_INCS" "$INCXML2"
+            cnf_append "SDK_VBoXLibXml2_LIBS" "`strip_l "$LIBXML2"`"
           fi
         fi

trunk/configure.vbs

@@ -1581 +1581 @@
 
    strPathXml2 = UnixSlashes(PathAbs(strPathXml2))
-   CfgPrintAssign "SDK_VBOX_LIBXML2_DEFS", "_REENTRANT"
-   CfgPrintAssign "SDK_VBOX_LIBXML2_INCS", strPathXml2 & "/include"
-   CfgPrintAssign "SDK_VBOX_LIBXML2_LIBS", strPathXml2 & "/lib/libxml2.lib"
+   CfgPrintAssign "SDK_VBoXLibXml2_DEFS", "_REENTRANT"
+   CfgPrintAssign "SDK_VBoXLibXml2_INCS", strPathXml2 & "/include"
+   CfgPrintAssign "SDK_VBoXLibXml2_LIBS", strPathXml2 & "/lib/libxml2.lib"
 
    PrintResult "libxml2", strPathXml2

trunk/src/VBox/Runtime/Makefile.kmk

@@ -319 +319 @@
 #
 RuntimeBaseR3_TEMPLATE      = VBoxR3Static
-RuntimeBaseR3_SDKS          = VBOX_LIBXML2
+RuntimeBaseR3_SDKS          = VBoXLibXml2
 RuntimeBaseR3_SDKS.win      = $(VBOX_WINPSDK) $(VBOX_WINDDK)
 RuntimeBaseR3_DEFS          = \
@@ -2762 +2762 @@
 #
 VBoxRT_TEMPLATE                = VBoxR3DllNoPic
-VBoxRT_SDKS                    = VBOX_LIBXML2
+VBoxRT_SDKS                    = VBoXLibXml2
 ifdef VBOX_WITH_LIBCURL
  VBoxRT_SDKS                  += VBoxLibCurl
@@ -2856 +2856 @@
         $(SDK_VBoxLzf_LIBS) \
         $(PATH_STAGE_LIB)/SUPR3$(VBOX_SUFF_LIB)
-ifndef SDK_VBOX_LIBXML2_LIBS
+ifndef SDK_VBoXLibXml2_LIBS
  VBoxRT_LIBS                  += \
         $(PATH_STAGE_LIB)/VBox-libxml2$(VBOX_SUFF_LIB)
@@ -3001 +3001 @@
 VBoxRT-x86_TEMPLATE = VBoxR3Dll-x86
 VBoxRT-x86_INST.win = $(INST_DLL)x86/
-VBoxRT-x86_SDKS  = VBOX_LIBXML2
+VBoxRT-x86_SDKS  = VBoXLibXml2
 ifdef VBOX_WITH_LIBCURL
  VBoxRT-x86_SDKS += VBoxLibCurl-x86
@@ -3013 +3013 @@
         $(PATH_STAGE_LIB)/SUPR3-x86$(VBOX_SUFF_LIB)
 endif
-ifndef SDK_VBOX_LIBXML2_LIBS
+ifndef SDK_VBoXLibXml2_LIBS
  VBoxRT-x86_LIBS                 += \
         $(PATH_STAGE_LIB)/VBox-libxml2-x86$(VBOX_SUFF_LIB)

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

@@ -171 +171 @@
   endif
   ifeq ($(KBUILD_TARGET),linux)
-   ifdef SDK_VBOX_LIBXML2_LIBS
+   ifdef SDK_VBoXLibXml2_LIBS
     vbox-img_LIBS += xml2
    endif
   else ifeq ($(KBUILD_TARGET),freebsd)
    vbox-img_LIBS += iconv geom bsdxml sbuf
-   ifdef SDK_VBOX_LIBXML2_LIBS
+   ifdef SDK_VBoXLibXml2_LIBS
     vbox-img_LIBS += xml2 lzma
    endif
@@ -185 +185 @@
   else ifeq ($(KBUILD_TARGET),solaris)
    vbox-img_LIBS += kstat efi
-   ifdef SDK_VBOX_LIBXML2_LIBS
+   ifdef SDK_VBoXLibXml2_LIBS
     vbox-img_LIBS += xml2
    endif
@@ -221 +221 @@
  endif
  ifeq ($(KBUILD_TARGET),linux)
-  ifdef SDK_VBOX_LIBXML2_LIBS
+  ifdef SDK_VBoXLibXml2_LIBS
    vdkeystoremgr_LIBS += xml2
   endif

trunk/src/libs/Makefile.kmk

@@ -89 +89 @@
 if  !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS) \
  && !defined(VBOX_ONLY_ADDITIONS)
- ifeq ($(SDK_VBOX_LIBXML2_INCS),$(PATH_ROOT)/src/libs/libxml2-2.9.14/include)
+ ifeq ($(SDK_VBoXLibXml2_INCS),$(PATH_ROOT)/src/libs/libxml2-2.9.14/include)
   include $(PATH_SUB_CURRENT)/libxml2-2.9.14/Makefile.kmk
  endif