VirtualBox

Changeset 98255 in vbox for trunk


Ignore:
Timestamp:
Jan 23, 2023 5:45:52 PM (21 months ago)
Author:
vboxsync
Message:

*.kmk,configure*: s/VBOX_ZLIB_STATIC/VBoxZlibStatic/ s/VBOX_ZLIB-x86/VBoxZlib-x86/ s/VBOX_ZLIB/VBoxZlib/ (sdks) bugref:10348

Location:
trunk
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r98254 r98255  
    50505050
    50515051# zlib
    5052 SDK_VBOX_ZLIB                  := zlib for dll linking.
     5052SDK_VBoxZlib                  := zlib for dll linking.
    50535053if1of ($(KBUILD_TARGET), os2 solaris win)
    5054  SDK_VBOX_ZLIB_INCS            ?= $(PATH_ROOT)/src/libs/zlib-1.2.13
    5055  SDK_VBOX_ZLIB_LIBS            ?= $(PATH_STAGE_LIB)/VBox-zlib$(VBOX_SUFF_LIB)
     5054 SDK_VBoxZlib_INCS            ?= $(PATH_ROOT)/src/libs/zlib-1.2.13
     5055 SDK_VBoxZlib_LIBS            ?= $(PATH_STAGE_LIB)/VBox-zlib$(VBOX_SUFF_LIB)
    50565056else
    5057  SDK_VBOX_ZLIB_INCS            ?=
    5058  SDK_VBOX_ZLIB_LIBS            ?= z
    5059  SDK_VBOX_ZLIB_DEFS.linux      ?= _LARGEFILE64_SOURCE
    5060 endif
    5061 
    5062 SDK_VBOX_ZLIB-x86              := zlib/x86
    5063 SDK_VBOX_ZLIB-x86_EXTENDS       = VBOX_ZLIB
     5057 SDK_VBoxZlib_INCS            ?=
     5058 SDK_VBoxZlib_LIBS            ?= z
     5059 SDK_VBoxZlib_DEFS.linux      ?= _LARGEFILE64_SOURCE
     5060endif
     5061
     5062SDK_VBoxZlib-x86              := zlib/x86
     5063SDK_VBoxZlib-x86_EXTENDS       = VBoxZlib
    50645064if1of ($(KBUILD_TARGET), os2 solaris win)
    5065  SDK_VBOX_ZLIB_LIBS-x86        ?= $(PATH_STAGE_LIB)/VBox-zlib-x86$(VBOX_SUFF_LIB)
    5066 endif
    5067 
    5068 SDK_VBOX_ZLIB_STATIC           := zlib for static linking
    5069 SDK_VBOX_ZLIB_STATIC_EXTENDS   := VBOX_ZLIB
     5065 SDK_VBoxZlib_LIBS-x86        ?= $(PATH_STAGE_LIB)/VBox-zlib-x86$(VBOX_SUFF_LIB)
     5066endif
     5067
     5068SDK_VBoxZlibStatic           := zlib for static linking
     5069SDK_VBoxZlibStatic_EXTENDS   := VBoxZlib
    50705070if1of ($(KBUILD_TARGET), os2 win) # Not required on solaris.
    5071  SDK_VBOX_ZLIB_STATIC_LIBS      ?= $(PATH_STAGE_LIB)/VBox-zlib-static$(VBOX_SUFF_LIB)
     5071 SDK_VBoxZlibStatic_LIBS        ?= $(PATH_STAGE_LIB)/VBox-zlib-static$(VBOX_SUFF_LIB)
    50725072endif
    50735073
     
    65966596 TEMPLATE_VBoxR3Static_LIBS.$(KBUILD_TARGET_ARCH) += \
    65976597        $(SDK_VBoxLzf_STATIC_LIBS) \
    6598         $(SDK_VBOX_ZLIB_STATIC_LIBS)
     6598        $(SDK_VBoxZlibStatic_LIBS)
    65996599else
    66006600 TEMPLATE_VBoxR3Static_LIBS.$(KBUILD_TARGET_ARCH) += \
    66016601        $(SDK_VBoxLzf_LIBS) \
    6602         $(SDK_VBOX_ZLIB_LIBS)
     6602        $(SDK_VBoxZlib_LIBS)
    66036603 if1of ($(KBUILD_TARGET),darwin freebsd)
    66046604  TEMPLATE_VBoxR3Static_LIBS       += iconv
     
    68826882        $(if-expr !defined(SDK_VBoxLibXml2_LIBS),$(PATH_STAGE_LIB)/VBox-libxml2-static$(VBOX_SUFF_LIB),) \
    68836883        $(if-expr "$(KBUILD_TARGET)" == "win" || "$(KBUILD_TARGET)" == "os2" \
    6884                 ,$(SDK_VBoxLzf_STATIC_LIBS) $(SDK_VBOX_ZLIB_STATIC_LIBS) \
    6885                ,$(SDK_VBoxLzf_LIBS) $(SDK_VBOX_ZLIB_LIBS)) \
     6884                ,$(SDK_VBoxLzf_STATIC_LIBS) $(SDK_VBoxZlibStatic_LIBS) \
     6885               ,$(SDK_VBoxLzf_LIBS) $(SDK_VBoxZlib_LIBS)) \
    68866886        ,$(TEMPLATE_$(TEMPLATE_VBoxR3AutoTest_EXTENDS)_LIBS.$(KBUILD_TARGET_ARCH)))
    68876887
  • trunk/configure

    r98254 r98255  
    958958    if test_execute; then
    959959      echo "if1of (\$(KBUILD_TARGET),darwin freebsd haiku linux)" >> $CNF
    960       cnf_append " SDK_VBOX_ZLIB_LIBS" "`strip_l "$LIBZ"`"
    961       cnf_append " SDK_VBOX_ZLIB_INCS" "$INCZ"
     960      cnf_append " SDK_VBoxZlib_LIBS" "`strip_l "$LIBZ"`"
     961      cnf_append " SDK_VBoxZlib_INCS" "$INCZ"
    962962      echo "endif" >> $CNF
    963963    fi
  • trunk/src/VBox/Additions/common/VBoxControl/Makefile.kmk

    r98195 r98255  
    4747VBoxControl_DEFS.win += \
    4848        $(if $(VBOX_WITH_DPC_LATENCY_CHECKER),VBOX_WITH_DPC_LATENCY_CHECKER,)
    49 VBoxControl_SDKS = VBOX_ZLIB_STATIC
     49VBoxControl_SDKS = VBoxZlibStatic
    5050VBoxControl_SOURCES = \
    5151        VBoxControl.cpp
  • trunk/src/VBox/Devices/Makefile.kmk

    r98251 r98255  
    577577
    578578 if defined(VBOX_WITH_CLOUD_NET) && defined(VBOX_WITH_LIBSSH)
    579   VBoxDD_SDKS           += VBoxLibSsh VBOX_ZLIB VBoxOpenSsl
     579  VBoxDD_SDKS           += VBoxLibSsh VBoxZlib VBoxOpenSsl
    580580  VBoxDD_DEFS           += VBOX_WITH_CLOUD_NET
    581581  VBoxDD_SOURCES        += \
  • trunk/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk

    r98128 r98255  
    117117 VBoxDTraceCmd_DEFS.linux = _XOPEN_SOURCE=700 _LARGEFILE64_SOURCE
    118118 VBoxDTraceCmd_DEFS.win = YY_USE_PROTOS=1 YYENABLE_NLS=0 YYLTYPE_IS_TRIVIAL=0
    119  VBoxDTraceCmd_SDKS = VBOX_ZLIB
     119 VBoxDTraceCmd_SDKS = VBoxZlib
    120120 ifn1of ($(KBUILD_TARGET), win)
    121121  VBoxDTraceCmd_CFLAGS = -Wno-format $(VBOX_GCC_Wno-overlength-strings) -Wno-sign-compare -Wno-strict-prototypes -Wno-missing-prototypes -Wno-missing-declarations -Wno-shadow
  • trunk/src/VBox/Main/Makefile.kmk

    r98252 r98255  
    583583        $(LIB_DDU)
    584584
    585 VBoxSVC_SDKS = VBoxLibPng VBOX_ZLIB
     585VBoxSVC_SDKS = VBoxLibPng VBoxZlib
    586586VBoxSVC_LIBS.solaris = \
    587587        adm \
     
    10131013endif
    10141014
    1015 VBoxC_SDKS = VBoxLibPng VBOX_ZLIB
     1015VBoxC_SDKS = VBoxLibPng VBoxZlib
    10161016
    10171017ifdef VBOX_WITH_RECORDING
  • trunk/src/VBox/Runtime/Makefile.kmk

    r98254 r98255  
    357357RuntimeBaseR3_INCS          = \
    358358        include \
    359         $(SDK_VBOX_ZLIB_INCS) \
     359        $(SDK_VBoxZlib_INCS) \
    360360        $(SDK_VBoxLzf_INCS)
    361361
     
    28612861endif
    28622862VBoxRT_LIBS                   += \
    2863         $(SDK_VBOX_ZLIB_LIBS)
     2863        $(SDK_VBoxZlib_LIBS)
    28642864ifndef SDK_VBoxOpenSslStatic_LIBS
    28652865 VBoxRT_LIBS                  += \
     
    30183018endif
    30193019VBoxRT-x86_LIBS                  += \
    3020         $(SDK_VBOX_ZLIB_LIBS-x86)
     3020        $(SDK_VBoxZlib_LIBS-x86)
    30213021ifndef SDK_VBoxOpenSslStatic_LIBS
    30223022 VBoxRT-x86_LIBS                 += \
  • trunk/src/VBox/Storage/testcase/Makefile.kmk

    r98254 r98255  
    164164   vbox-img_LIBS += \
    165165        $(SDK_VBoxLzf_STATIC_LIBS) \
    166         $(SDK_VBOX_ZLIB_STATIC_LIBS)
     166        $(SDK_VBoxZlibStatic_LIBS)
    167167  else
    168168   vbox-img_LIBS += \
    169169        $(SDK_VBoxLzf_LIBS) \
    170         $(SDK_VBOX_ZLIB_LIBS)
     170        $(SDK_VBoxZlib_LIBS)
    171171  endif
    172172  ifeq ($(KBUILD_TARGET),linux)
     
    214214  vdkeystoremgr_LIBS += \
    215215        $(SDK_VBoxLzf_STATIC_LIBS) \
    216         $(SDK_VBOX_ZLIB_STATIC_LIBS)
     216        $(SDK_VBoxZlibStatic_LIBS)
    217217 else
    218218  vdkeystoremgr_LIBS += \
    219219        $(SDK_VBoxLzf_LIBS) \
    220         $(SDK_VBOX_ZLIB_LIBS)
     220        $(SDK_VBoxZlib_LIBS)
    221221 endif
    222222 ifeq ($(KBUILD_TARGET),linux)
  • trunk/src/VBox/ValidationKit/Config.kmk

    r98234 r98255  
    9999ifneq ($(KBUILD_TARGET),win)
    100100 TEMPLATE_VBoxValidationKitR3_LIBS += \
    101         $(SDK_VBOX_ZLIB_LIBS)
     101        $(SDK_VBoxZlib_LIBS)
    102102endif
    103103
  • trunk/src/VBox/ValidationKit/utils/audio/Makefile.kmk

    r98164 r98255  
    177177vkatadd_EXTENDS_BY     = appending
    178178vkatadd_NAME           = VBoxAudioTest
    179 vkatadd_SDKS           = VBOX_ZLIB_STATIC
     179vkatadd_SDKS           = VBoxZlibStatic
    180180vkatadd_LDFLAGS.darwin = -framework IOKit
    181181vkatadd_LIBS.solaris   = m
  • trunk/src/VBox/ValidationKit/utils/misc/Makefile.kmk

    r98103 r98255  
    7171PROGRAMS += vts_tar
    7272vts_tar_TEMPLATE = VBoxValidationKitR3
    73 vts_tar_SDKS     = VBOX_ZLIB_STATIC
     73vts_tar_SDKS     = VBoxZlibStatic
    7474vts_tar_SOURCES  = vts_tar.cpp
    7575
  • trunk/src/libs/Makefile.kmk

    r98254 r98255  
    116116# zlib is used by the IPRT compression code, libpng and others.
    117117if  !defined(VBOX_ONLY_SDK) \
    118  && "$(SDK_VBOX_ZLIB_INCS)" == "$(PATH_ROOT)/src/libs/zlib-1.2.13"
     118 && "$(SDK_VBoxZlib_INCS)" == "$(PATH_ROOT)/src/libs/zlib-1.2.13"
    119119 include $(PATH_SUB_CURRENT)/zlib-1.2.13/Makefile.kmk
    120120endif
  • trunk/src/libs/curl-7.83.1/Makefile.kmk

    r98241 r98255  
    3333LIBRARIES += VBox-libcurl
    3434VBox-libcurl_TEMPLATE       = VBoxR3RuntimeDllNonPedantic
    35 VBox-libcurl_SDKS           = VBOX_ZLIB VBoxOpenSslStatic
     35VBox-libcurl_SDKS           = VBoxZlib VBoxOpenSslStatic
    3636VBox-libcurl_DEFS           = \
    3737        CURL_STATICLIB \
  • trunk/src/libs/libpng-1.6.37/Makefile.kmk

    r98103 r98255  
    3131LIBRARIES += VBox-libpng
    3232VBox-libpng_TEMPLATE = VBoxR3DllNonPedantic
    33 VBox-libpng_SDKS = VBOX_ZLIB
     33VBox-libpng_SDKS = VBoxZlib
    3434VBox-libpng_CFLAGS.win = -wd4310
    3535# -wd2220 -wd4431 # pngrutil.c(1268) : warning C4310: cast truncates constant value
  • trunk/src/libs/libxml2-2.9.14/Makefile.kmk

    r98103 r98255  
    3333endif
    3434VBox-libxml2_TEMPLATE       = VBoxR3RuntimeDllNonPedantic
    35 VBox-libxml2_SDKS           = VBOX_ZLIB
     35VBox-libxml2_SDKS           = VBoxZlib
    3636VBox-libxml2_DEFS           = _REENTRANT # the latter triggers thread support, see xmlversion-default.h and win32xmlversion.h.
    3737VBox-libxml2_DEFS.win       = WIN32 _WINDOWS _MBCS _CRT_SECURE_NO_DEPRECATE _CRT_NONSTDC_NO_DEPRECATE \
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette