1- # $Id: Config.kmk 111668 2025年11月12日 12:23:09Z knut.osmundsen@oracle.com $
1+ # $Id: Config.kmk 111669 2025年11月12日 12:30:54Z knut.osmundsen@oracle.com $
22## @file
33# The global build configuration file for VBox.
44#
@@ -5281,8 +5281,9 @@ SDK_VBoxLibXml2_DEFS.win ?= WIN32 _WINDOWS _MBCS HAVE_WIN32_THREADS HAVE_CO
52815281
52825282# zlib
52835283SDK_VBoxZlib := zlib for dll linking.
5284+ SDK_VBoxZlib_VBOX_DEFAULT_INCS := $(PATH_ROOT)/src/libs/zlib-1.3.1
52845285if1of ($(KBUILD_TARGET), os2 solaris win)
5285- SDK_VBoxZlib_INCS ?= $(PATH_ROOT)/src/libs/zlib-1.3.1
5286+ SDK_VBoxZlib_INCS ?= $(SDK_VBoxZlib_VBOX_DEFAULT_INCS)
52865287 SDK_VBoxZlib_LATE_LIBS ?= $(PATH_STAGE_LIB)/VBox-zlib$(VBOX_SUFF_LIB)
52875288else
52885289 SDK_VBoxZlib_INCS ?=
@@ -5292,7 +5293,7 @@ endif
52925293
52935294SDK_VBoxZlib-x86 := zlib/x86
52945295SDK_VBoxZlib-x86_EXTENDS = VBoxZlib
5295- if1of ($(KBUILD_TARGET), os2 solaris win )
5296+ ifeq ($(SDK_VBoxZlib_INCS),$(SDK_VBoxZlib_VBOX_DEFAULT_INCS) )
52965297 SDK_VBoxZlib-x86_LIBS ?= $(PATH_STAGE_LIB)/VBox-zlib-x86$(VBOX_SUFF_LIB)
52975298endif
52985299
@@ -5304,7 +5305,7 @@ endif
53045305
53055306SDK_VBoxZlibBldProg := zlib for static linking
53065307SDK_VBoxZlibBldProg_EXTENDS := VBoxZlib
5307- ifeq ($(PATH_ROOT)/src/libs,$(substr $( SDK_VBoxZlib_INCS), 1, $(length $(PATH_ROOT)/src/libs) ))
5308+ ifeq ($(SDK_VBoxZlib_INCS),$(SDK_VBoxZlib_VBOX_DEFAULT_INCS ))
53085309 SDK_VBoxZlibBldProg_LATE_LIBS ?= $(PATH_STAGE_LIB)/VBoxBldProg-zlib$(VBOX_SUFF_LIB)
53095310endif
53105311
@@ -9468,7 +9469,7 @@ SVN ?= svn$(HOSTSUFF_EXE)
94689469GIT ?= git$(HOSTSUFF_EXE)
94699470VBOX_SVN_REV_KMK = $(PATH_OUT)/revision.kmk
94709471ifndef VBOX_SVN_REV
9471- VBOX_SVN_REV_CONFIG_FALLBACK := $(patsubst %:,, $Rev: 111668 $ )
9472+ VBOX_SVN_REV_CONFIG_FALLBACK := $(patsubst %:,, $Rev: 111669 $ )
94729473 VBOX_SVN_REV_FALLBACK := $(if-expr $(VBOX_SVN_REV_CONFIG_FALLBACK) > $(VBOX_SVN_REV_VERSION_FALLBACK),$(VBOX_SVN_REV_CONFIG_FALLBACK),$(VBOX_SVN_REV_VERSION_FALLBACK))
94739474 VBOX_SVN_DEP := $(firstword $(wildcard $(PATH_ROOT)/.svn/wc.db $(abspath $(PATH_ROOT)/../.svn/wc.db) $(abspath $(PATH_ROOT)/../../.svn/wc.db) $(PATH_ROOT)/.svn/entries))
94749475 VBOX_GIT_DEP := $(firstword $(wildcard $(PATH_ROOT)/.git/config $(abspath $(PATH_ROOT)/../.git/config) $(abspath $(PATH_ROOT)/../../.git/config)))
@@ -9482,7 +9483,7 @@ ifndef VBOX_SVN_REV
94829483 ifneq ($(VBOX_GIT_DEP),)
94839484 #
94849485 # VBOX_SVN_REV_CONFIG_FALLBACK is not properly populated for a git checkout,
9485- # as the $Rev: 111668 $ is not expanded, so we have to set it based on the information in the repo.
9486+ # as the $Rev: 111669 $ is not expanded, so we have to set it based on the information in the repo.
94869487 #
94879488 VBOX_SVN_REV_FALLBACK := $(shell $(GIT) log -1 $(PATH_ROOT)/Config.kmk | $(SED) -e 's/^[ \t]*//' -e '/svn:sync-xref-src-repo-rev\: r/!d' -e 's/svn:sync-xref-src-repo-rev\: r*//; t a; :a q')
94889489 endif
0 commit comments