VirtualBox

Ignore:
Timestamp:
Feb 1, 2023 1:30:13 PM (2 years ago)
Author:
vboxsync
Message:

libs/openssl-3.0.7: *.kmk cleanup by scm. bugref:10348

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/libs/openssl-3.0.7/providers/Makefile.kmk

    r98241 r98391  
    6565        nullprov.c \
    6666        prov_running.c
    67  VBox-libproviders_SOURCES += $(foreach sublib,$(VBOX_CRYPTO_PROVIDERS_SUBLIBS), $($(sublib)_1_TARGET))
     67VBox-libproviders_SOURCES += $(foreach sublib,$(VBOX_CRYPTO_PROVIDERS_SUBLIBS), $($(sublib)_1_TARGET))
    6868
    6969ifdef VBOX_WITH_32_ON_64_MAIN_API # 32-bit edition.
     
    7272 VBox-libproviders-x86_EXTENDS = VBox-libproviders
    7373 VBox-libproviders-x86_SOURCES = $(filter %.c %.cpp,$(VBox-libproviders_SOURCES)) \
    74         $(foreach sublib,$(VBOX_CRYPTO_PROVIDERS_SUBLIBS_X86), $($(sublib)_1_TARGET))
     74        $(foreach sublib,$(VBOX_CRYPTO_PROVIDERS_SUBLIBS_X86), $($(sublib)_1_TARGET))
    7575endif
    7676
     
    9090# The build program libproviders version.
    9191#
    92 LIBRARIES += VBoxBldProg-libproviders
    93 VBoxBldProg-libproviders          = For bldRTSignTool
    94 VBoxBldProg-libproviders_EXTENDS = VBox-libproviders
    95 VBoxBldProg-libproviders_TEMPLATE = VBoxLibCryptoBldProg
    96 VBoxBldProg-libproviders_SOURCES = \
    97         $(filter %.c,$(VBox-libproviders_SOURCES)) \
    98         $(foreach sublib,$(VBOX_CRYPTO_PROVIDERS_SUBLIBS), $(VBoxBldProg-$(sublib)_1_TARGET))
     92 LIBRARIES += VBoxBldProg-libproviders
     93 VBoxBldProg-libproviders         = For bldRTSignTool
     94 VBoxBldProg-libproviders_EXTENDS = VBox-libproviders
     95 VBoxBldProg-libproviders_TEMPLATE = VBoxLibCryptoBldProg
     96 VBoxBldProg-libproviders_SOURCES = \
     97        $(filter %.c,$(VBox-libproviders_SOURCES)) \
     98        $(foreach sublib,$(VBOX_CRYPTO_PROVIDERS_SUBLIBS), $(VBoxBldProg-$(sublib)_1_TARGET))
    9999
    100 define def_VBoxBldProg_libproviders_inherit
    101  LIBRARIES += VBoxBldProg-$(sublib)
    102  VBoxBldProg-$(sublib) = bldRTSignTool version of $(sublib)
    103  VBoxBldProg-$(sublib)_EXTENDS    = $(sublib)
    104  VBoxBldProg-$(sublib)_EXTENDS_BY = appending
    105  VBoxBldProg-$(sublib)_TEMPLATE   = VBoxSubLibCryptoBldProg
    106  VBoxBldProg-$(sublib)_DEFPATH    = $($(sublib)_DEFPATH)
     100 define def_VBoxBldProg_libproviders_inherit
     101  LIBRARIES += VBoxBldProg-$(sublib)
     102  VBoxBldProg-$(sublib) = bldRTSignTool version of $(sublib)
     103  VBoxBldProg-$(sublib)_EXTENDS   = $(sublib)
     104  VBoxBldProg-$(sublib)_EXTENDS_BY = appending
     105  VBoxBldProg-$(sublib)_TEMPLATE  = VBoxSubLibCryptoBldProg
     106  VBoxBldProg-$(sublib)_DEFPATH   = $($(sublib)_DEFPATH)
    107107 ## @todo kBuild: DEFPATH isn't inherited! FIXME!
    108 endef
    109 $(foreach sublib,$(VBOX_CRYPTO_PROVIDERS_SUBLIBS), $(eval $(def_VBoxBldProg_libproviders_inherit)))
     108 endef
     109 $(foreach sublib,$(VBOX_CRYPTO_PROVIDERS_SUBLIBS), $(eval $(def_VBoxBldProg_libproviders_inherit)))
    110110
    111111endif # VBOX_WITH_BLD_RTSIGNTOOL_SIGNING
     
    132132#
    133133recreate-providers-headers: $(VBOX_PATH_OPENSSL)/util/dofile.pl \
    134         $(OSSL_PROVIDERS_HDR_TEMPLATES) \
    135         recreate-providers-der-sources
     134                $(OSSL_PROVIDERS_HDR_TEMPLATES) \
     135                recreate-providers-der-sources
    136136        $(foreach header, $(OSSL_PROVIDERS_HDR_TEMPLATES), \
    137137            perl \
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