VirtualBox

Changeset 102247 in vbox


Ignore:
Timestamp:
Nov 22, 2023 10:56:47 AM (12 months ago)
Author:
vboxsync
Message:

libs/xpcom: Some Makefile.kmk/Config.kmk love, bugref:10545

Location:
trunk/src/libs/xpcom18a4
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/libs/xpcom18a4/Config.kmk

    r102229 r102247  
    171171        $(VBOX_PATH_SDK)/bindings/xpcom/include/ipcd \
    172172        .
    173 ifn1of ($(VBOX_DEF_MACOSX_VERSION_MIN), 10.4 10.5 10.6 10.7) # FlatCarbon is gone starting 10.8 (or Xcode 5.0).
    174  TEMPLATE_XPComDll_DEFS.darwin       += VBOX_WITH_NEWER_OSX_SDK
    175  TEMPLATE_XPComDll_INCS.darwin        = \
    176         $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/CoreFoundation.framework/Versions/A/Headers/ \
    177         $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/ \
    178         $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/HIServices.framework/Versions/A/Headers/
    179 else
    180  TEMPLATE_XPComDll_INCS.darwin        = $(VBOX_PATH_MACOSX_SDK)/Developer/Headers/FlatCarbon
    181 endif
    182 TEMPLATE_XPComDll_LIBS.solaris        = sendfile
     173TEMPLATE_XPComDll_DEFS.darwin       += VBOX_WITH_NEWER_OSX_SDK
     174TEMPLATE_XPComDll_INCS.darwin        = \
     175        $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/CoreFoundation.framework/Versions/A/Headers/ \
     176        $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/ \
     177        $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/HIServices.framework/Versions/A/Headers/
     178
    183179TEMPLATE_XPComDll_ORDERDEPS           = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $($(hdrinst)_1_TARGET)) \
    184180        $(PATH_TARGET)/VBox-xpcom-idl-timestamp
    185 ifeq ($(KBUILD_TARGET),os2)
    186  ifndef USE_OS2_TOOLKIT_HEADERS
    187   TEMPLATE_XPComDll_DEFS.os2         += OS2EMX_PLAIN_CHAR
    188  endif
    189  TEMPLATE_XPComDll_DEFS.os2          += XP_OS2_EMX OS2=4
    190  # this is at least for strnicmp()
    191  TEMPLATE_XPComDll_DEFS.os2          += _EMX_SOURCE
    192  # @@todo shouldn't this be somehow default for ASTOOL?
    193  TEMPLATE_XPComDll_ASFLAGS.os2       += -Zomf
    194 endif
    195181
    196182# When using IPRT in NSRP or/and using IPRT for logging, link with IPRT.
    … …  
    279265TEMPLATE_XPComBldProg_ORDERDEPS          = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $($(hdrinst)_1_TARGET))
    280266
    281 
    282 ifeq ($(VBOX_DEF_MACOSX_VERSION_MIN),10.4)
    283  #
    284  # Template for building VBoxPython against the Mac OS X 10.4 SDK.
    285  # ASSUMES that the SDK bits are in the .darwin properties we're overriding below.
    286  #
    287  TEMPLATE_XPComDllOSX104                    = XPCOM libraries (shared) built against the Mac OS X 10.4 SDK
    288  TEMPLATE_XPComDllOSX104_EXTENDS            = XPComDll
    289  TEMPLATE_XPComDllOSX104_CXXFLAGS.darwin    = $(filter-out $(VBOX_DARWIN_DEF_SDK_CXXFLAGS),$(TEMPLATE_XPComDll_CXXFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_4_CXXFLAGS)
    290  TEMPLATE_XPComDllOSX104_CFLAGS.darwin      = $(filter-out $(VBOX_DARWIN_DEF_SDK_CFLAGS),$(TEMPLATE_XPComDll_CFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_4_CFLAGS)
    291  TEMPLATE_XPComDllOSX104_LDFLAGS.darwin     = $(filter-out $(VBOX_DARWIN_DEF_SDK_LDFLAGS),$(TEMPLATE_XPComDll_LDFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_4_LDFLAGS)
    292  TEMPLATE_XPComDllOSX104_DEFS.darwin        = $(filter-out $(VBOX_DARWIN_DEF_SDK_DEFS),$(TEMPLATE_XPComDll_DEFS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_4_DEFS)
    293  TEMPLATE_XPComDllOSX104_INCS.darwin        = $(VBOX_PATH_MACOSX_SDK_10_4)/Developer/Headers/FlatCarbon
    294 endif
    295 
    296 #
    297 # Template for building VBoxPython against the Mac OS X 10.5 SDK.
    298 # ASSUMES that the SDK bits are in the .darwin properties we're overriding below.
    299 #
    300 TEMPLATE_XPComDllOSX105                    = XPCOM libraries (shared) built against the Mac OS X 10.5 SDK
    301 TEMPLATE_XPComDllOSX105_EXTENDS            = XPComDll
    302 TEMPLATE_XPComDllOSX105_CXXFLAGS.darwin    = $(filter-out $(VBOX_DARWIN_DEF_SDK_CXXFLAGS),$(TEMPLATE_XPComDll_CXXFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_5_CXXFLAGS)
    303 TEMPLATE_XPComDllOSX105_CFLAGS.darwin      = $(filter-out $(VBOX_DARWIN_DEF_SDK_CFLAGS),$(TEMPLATE_XPComDll_CFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_5_CFLAGS)
    304 TEMPLATE_XPComDllOSX105_LDFLAGS.darwin     = $(filter-out $(VBOX_DARWIN_DEF_SDK_LDFLAGS),$(TEMPLATE_XPComDll_LDFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_5_LDFLAGS)
    305 TEMPLATE_XPComDllOSX105_DEFS.darwin        = $(filter-out $(VBOX_DARWIN_DEF_SDK_DEFS),$(TEMPLATE_XPComDll_DEFS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_5_DEFS)
    306 TEMPLATE_XPComDllOSX105_INCS.darwin        = $(VBOX_PATH_MACOSX_SDK_10_5)/Developer/Headers/FlatCarbon
    307 
    308 #
    309 # Template for building VBoxPython against the Mac OS X 10.6 SDK.
    310 # ASSUMES that the SDK bits are in the .darwin properties we're overriding below.
    311 #
    312 TEMPLATE_XPComDllOSX106                    = XPCOM libraries (shared) built against the Mac OS X 10.6 SDK
    313 TEMPLATE_XPComDllOSX106_EXTENDS            = XPComDll
    314 TEMPLATE_XPComDllOSX106_CXXFLAGS.darwin    = $(filter-out $(VBOX_DARWIN_DEF_SDK_CXXFLAGS),$(TEMPLATE_XPComDll_CXXFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_6_CXXFLAGS)
    315 TEMPLATE_XPComDllOSX106_CFLAGS.darwin      = $(filter-out $(VBOX_DARWIN_DEF_SDK_CFLAGS),$(TEMPLATE_XPComDll_CFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_6_CFLAGS)
    316 TEMPLATE_XPComDllOSX106_LDFLAGS.darwin     = $(filter-out $(VBOX_DARWIN_DEF_SDK_LDFLAGS),$(TEMPLATE_XPComDll_LDFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_6_LDFLAGS)
    317 TEMPLATE_XPComDllOSX106_DEFS.darwin        = $(filter-out $(VBOX_DARWIN_DEF_SDK_DEFS),$(TEMPLATE_XPComDll_DEFS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_6_DEFS)
    318 TEMPLATE_XPComDllOSX106_INCS.darwin        = $(VBOX_PATH_MACOSX_SDK_10_6)/Developer/Headers/FlatCarbon
    319 
    320 #
    321 # Template for building VBoxPython against the Mac OS X 10.7 SDK.
    322 # ASSUMES that the SDK bits are in the .darwin properties we're overriding below.
    323 #
    324 TEMPLATE_XPComDllOSX107                    = XPCOM libraries (shared) built against the Mac OS X 10.7 SDK
    325 TEMPLATE_XPComDllOSX107_EXTENDS            = XPComDll
    326 TEMPLATE_XPComDllOSX107_TOOL               = LLVMGXX42MACHO
    327 TEMPLATE_XPComDllOSX107_CXXFLAGS.darwin    = $(filter-out $(VBOX_DARWIN_DEF_SDK_CXXFLAGS),$(TEMPLATE_XPComDll_CXXFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_7_CXXFLAGS)
    328 TEMPLATE_XPComDllOSX107_CFLAGS.darwin      = $(filter-out $(VBOX_DARWIN_DEF_SDK_CFLAGS),$(TEMPLATE_XPComDll_CFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_7_CFLAGS)
    329 TEMPLATE_XPComDllOSX107_LDFLAGS.darwin     = $(filter-out $(VBOX_DARWIN_DEF_SDK_LDFLAGS),$(TEMPLATE_XPComDll_LDFLAGS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_7_LDFLAGS)
    330 TEMPLATE_XPComDllOSX107_DEFS.darwin        = $(filter-out $(VBOX_DARWIN_DEF_SDK_DEFS),$(TEMPLATE_XPComDll_DEFS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_7_DEFS)
    331 TEMPLATE_XPComDllOSX107_INCS.darwin        = $(VBOX_PATH_MACOSX_SDK_10_7)/Developer/Headers/FlatCarbon
    332267
    333268

  • trunk/src/libs/xpcom18a4/Makefile.kmk

    r102245 r102247  
    385385VBox-xpcom-nspr_INSTTYPE   = none
    386386VBox-xpcom-nspr_DEFS       = \
    387         _NSPR_BUILD_ \
    388         HAVE_LCHOWN=1 \
    389         HAVE_STRERROR=1 \
    390         FORCE_PR_LOG
    391 VBox-xpcom-nspr_DEFS      += \
    392         VBOX_USE_IPRT_IN_NSPR
    393 VBox-xpcom-nspr_DEFS.darwin.amd64 = \
    394         VBOX_USE_MORE_IPRT_IN_NSPR
    395 VBox-xpcom-nspr_DEFS.darwin.arm64 = \
    396         VBOX_USE_MORE_IPRT_IN_NSPR
    397 VBox-xpcom-nspr_DEFS.darwin = \
    398         HAVE_BSD_FLOCK=1 \
    399         HAVE_SOCKLEN_T=1 \
    400         _PR_PTHREADS
    401 VBox-xpcom-nspr_DEFS.freebsd = \
    402         HAVE_CVAR_BUILT_ON_SEM \
    403         _PR_PTHREADS
    404 ## @todo filling in the missing stuff, please don't just copy it from linux.
     387        _NSPR_BUILD_
    405388VBox-xpcom-nspr_DEFS.linux = \
    406389        _POSIX_SOURCE=1 \
    … …  
    408391        _SVID_SOURCE=1 \
    409392        _DEFAULT_SOURCE \
    410         _REENTRANT=1 \
    411         _LARGEFILE64_SOURCE=1 \
    412         HAVE_FCNTL_FILE_LOCKING=1 \
    413         HAVE_CVAR_BUILT_ON_SEM \
    414         _PR_PTHREADS
     393        _REENTRANT=1
    415394# _BSD_SOURCE is here to keep the Glibc header files happy and make them include the right things
    416 VBox-xpcom-nspr_DEFS.netbsd = \
    417         _PR_PTHREADS
    418 VBox-xpcom-nspr_DEFS.openbsd = \
    419         _PR_PTHREADS
    420 VBox-xpcom-nspr_DEFS.solaris = \
    421         HAVE_FCNTL_FILE_LOCKING=1 \
    422         HAVE_SOCKLEN_T=1 \
    423         _PR_PTHREADS
    424395VBox-xpcom-nspr_INCS = \
    425         nsprpub/pr/include/private \
    426396        $(VBox-xpcom-nspr_0_OUTDIR)
    427 
    428397VBox-xpcom-nspr_SOURCES  = \
    429398        nsprpub/pr/src/io/prprf.c \
    … …  
    435404        nsprpub/lib/libc/src/strcpy.c \
    436405        nsprpub/lib/libc/src/strcmp.c \
    437         nsprpub/lib/libc/src/strccmp.c
    438 
    439 ifeq ($(filter-out darwin freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # unixish
    440  VBox-xpcom-nspr_SOURCES += \
    441         nsprpub/pr/src/pthreads/ptsynch.c
    442 endif
     406        nsprpub/lib/libc/src/strccmp.c \
     407        nsprpub/pr/src/pthreads/ptsynch.c
    443408
    444409$(call KB_FN_DO_PASS0_ON_TARGET,VBox-xpcom-nspr)
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