VirtualBox

Changeset 98389 in vbox for trunk


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

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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/libs/openssl-3.0.7/Config.kmk

    r98229 r98389  
    3434VBOX_CRYPTO_ASM_SCHEME := portme
    3535if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
    36   VBOX_CRYPTO_ASM_SCHEME := elf
    37 else ifeq ($(KBUILD_TARGET), darwin)
    38   VBOX_CRYPTO_ASM_SCHEME := macosx
    39 else ifeq ($(KBUILD_TARGET), win)
    40   VBOX_CRYPTO_ASM_SCHEME := nasm
     36 VBOX_CRYPTO_ASM_SCHEME := elf
     37else ifeq ($(KBUILD_TARGET),darwin)
     38 VBOX_CRYPTO_ASM_SCHEME := macosx
     39else ifeq ($(KBUILD_TARGET),win)
     40 VBOX_CRYPTO_ASM_SCHEME := nasm
    4141endif
    4242
    … …  
    6363if1of ($(KBUILD_TARGET_ARCH), x86 amd64)
    6464 ifneq ($(VBOX_CRYPTO_ASM_SCHEME),portme)
    65   ifn1of ($(KBUILD_TARGET), ) # Selective exclusion for testing.
     65  ifn1of ($(KBUILD_TARGET), ) # Selective exclusion for testing.  scm:ignore-empty-if1of-set
    6666   VBOX_WITH_CRYPTO_ASM = 1
    6767  endif
    … …  
    190190        include/openssl/x509err.h=>x509err.h \
    191191        include/openssl/x509v3err.h=>x509v3err.h \
    192       \
     192        \
    193193        openssl-mangling.h=>openssl-mangling.h \
    194       \
     194        \
    195195        gen-includes/openssl/asn1.h=>asn1.h \
    196196        gen-includes/openssl/asn1t.h=>asn1t.h \
    … …  
    241241TEMPLATE_LibCrypto = Template for the OpenSSL crypto library.
    242242TEMPLATE_LibCrypto_EXTENDS = VBoxR3RuntimeDllNonPedantic
    243 ifneq ($(KBUILD_TARGET), win)
     243ifneq ($(KBUILD_TARGET),win)
    244244 TEMPLATE_LibCrypto_ASTOOL          = $(TEMPLATE_VBoxR3RuntimeDllNonPedantic_TOOL)
    245245 TEMPLATE_LibCrypto_ASFLAGS         = -include $(VBOX_PATH_OPENSSL)/openssl-mangling.h
    … …  
    262262        OPENSSL_BUILDING_OPENSSL
    263263ifdef VBOX_WITH_CRYPTO_ASM
    264 TEMPLATE_LibCrypto_DEFS += \
    265         OPENSSL_BN_ASM_MONT \
    266         OPENSSL_BN_ASM_GF2m \
    267         SHA1_ASM \
    268         SHA256_ASM \
    269         SHA512_ASM \
    270         RC4_ASM \
    271         MD5_ASM \
    272         AES_ASM \
    273         VPAES_ASM \
    274         ECP_NISTZ256_ASM \
    275         PADLOCK_ASM \
    276         POLY1305_ASM
    277 TEMPLATE_LibCrypto_DEFS.amd64 = \
    278         BSAES_ASM \
    279         GHASH_ASM \
    280         KECCAK1600_ASM \
    281         OPENSSL_BN_ASM_MONT5 \
    282         X25519_ASM
     264 TEMPLATE_LibCrypto_DEFS += \
     265        OPENSSL_BN_ASM_MONT \
     266        OPENSSL_BN_ASM_GF2m \
     267        SHA1_ASM \
     268        SHA256_ASM \
     269        SHA512_ASM \
     270        RC4_ASM \
     271        MD5_ASM \
     272        AES_ASM \
     273        VPAES_ASM \
     274        ECP_NISTZ256_ASM \
     275        PADLOCK_ASM \
     276        POLY1305_ASM
     277 TEMPLATE_LibCrypto_DEFS.amd64 = \
     278        BSAES_ASM \
     279        GHASH_ASM \
     280        KECCAK1600_ASM \
     281        OPENSSL_BN_ASM_MONT5 \
     282        X25519_ASM
    283283else
    284 TEMPLATE_LibCrypto_DEFS += \
    285         OPENSSL_NO_ASM
     284 TEMPLATE_LibCrypto_DEFS += \
     285        OPENSSL_NO_ASM
    286286endif
    287287if1of ($(KBUILD_TARGET), linux solaris)
    288 TEMPLATE_LibCrypto_DEFS += \
    289         _REENTRANT \
    290         _GNU_SOURCE
     288 TEMPLATE_LibCrypto_DEFS += \
     289        _REENTRANT \
     290        _GNU_SOURCE
    291291endif
    292292ifeq ($(sort $(filter -fPIC,$(TEMPLATE_VBoxR3RuntimeDllNonPedantic_CFLAGS))),-fPIC)
    293 TEMPLATE_LibCrypto_DEFS += \
    294         OPENSSL_PIC
     293 TEMPLATE_LibCrypto_DEFS += \
     294        OPENSSL_PIC
    295295endif
    296296TEMPLATE_LibCrypto_DEFS.amd64 += \
    297297        MD32_REG_T=int
    298298ifeq ($(KBUILD_TARGET),win)
    299 TEMPLATE_LibCrypto_DEFS += \
    300         OPENSSL_SYSNAME_WIN32 \
    301         OPENSSL_RAND_SEED_OS
     299 TEMPLATE_LibCrypto_DEFS += \
     300        OPENSSL_SYSNAME_WIN32 \
     301        OPENSSL_RAND_SEED_OS
    302302# Exclude WinCrypt.h, causes trouble all over the place
    303 TEMPLATE_LibCrypto_DEFS += \
    304         NOCRYPT
     303 TEMPLATE_LibCrypto_DEFS += \
     304        NOCRYPT
    305305endif
    306306if1of ($(KBUILD_TARGET_ARCH), x86 amd64 arm64)
    307 TEMPLATE_LibCrypto_DEFS += \
    308         L_ENDIAN
     307 TEMPLATE_LibCrypto_DEFS += \
     308        L_ENDIAN
    309309else
    310 TEMPLATE_LibCrypto_DEFS += \
    311         B_ENDIAN
     310 TEMPLATE_LibCrypto_DEFS += \
     311        B_ENDIAN
    312312endif
    313313ifeq ($(KBUILD_TARGET),os2)
    314 TEMPLATE_LibCrypto_DEFS += \
    315         OPENSSL_NO_SECURE_MEMORY
     314 TEMPLATE_LibCrypto_DEFS += \
     315        OPENSSL_NO_SECURE_MEMORY
    316316endif
    317317if defined(VBOX_WITH_PARFAIT) #&& VBOX_GCC_VERSION_CC == 50301
    … …  
    369369TEMPLATE_LibCryptoTstExe_INCS    = $(TEMPLATE_LibCrypto_INCS) $(TEMPLATE_VBoxR3TstExe_INCS)
    370370ifeq ($(KBUILD_TARGET),win)
    371 TEMPLATE_LibCryptoTstExe_CFLAGS = $(filter-out $(VBOX_VCC_WERR), $(TEMPLATE_VBoxR3TstExe_CXXFLAGS)) $(VBOX_VCC_NON_PEDANTIC)
     371 TEMPLATE_LibCryptoTstExe_CFLAGS = $(filter-out $(VBOX_VCC_WERR), $(TEMPLATE_VBoxR3TstExe_CXXFLAGS)) $(VBOX_VCC_NON_PEDANTIC)
    372372else
    373 TEMPLATE_LibCryptoTstExe_CFLAGS = $(filter-out $(VBOX_GCC_PEDANTIC_C), $(TEMPLATE_VBoxR3TstExe_CFLAGS)) $(VBOX_GCC_NON_PEDANTIC_C)
     373 TEMPLATE_LibCryptoTstExe_CFLAGS = $(filter-out $(VBOX_GCC_PEDANTIC_C), $(TEMPLATE_VBoxR3TstExe_CFLAGS)) $(VBOX_GCC_NON_PEDANTIC_C)
    374374endif
    375375TEMPLATE_LibCryptoTstExe_LIBS    = $(PATH_STAGE_LIB)/VBox-libcrypto$(VBOX_SUFF_LIB) $(TEMPLATE_VBoxR3TstExe_LIBS)
    … …  
    380380# Build program versions of LibCrypto and SubLibCrypto for bldRTSignTool.
    381381#
    382 TEMPLATE_VBoxLibCryptoBldProg = Build program template the OpenSSL crypto library.
    383 TEMPLATE_VBoxLibCryptoBldProg_EXTENDS       := VBoxAdvBldProg
    384 TEMPLATE_VBoxLibCryptoBldProg_DEFS           = $(TEMPLATE_VBoxAdvBldProg_DEFS) $(TEMPLATE_LibCrypto_DEFS)
    385 TEMPLATE_VBoxLibCryptoBldProg_CFLAGS.win     = $(TEMPLATE_VBoxAdvBldProg_CFLAGS.win) $(subst $(TEMPLATE_VBoxR3RuntimeDllNonPedantic_CFLAGS.win),, $(TEMPLATE_LibCrypto_CFLAGS.win))
    386 TEMPLATE_VBoxLibCryptoBldProg_CFLAGS.win    += -wd4057 # refcount.h(137): warning C4057: 'function': 'volatile long *' differs in indirection to slightly different base types from 'volatile int *'
    387 TEMPLATE_VBoxLibCryptoBldProg_CFLAGS.win    += -wd4100 # refcount.h(135): warning C4100: 'lock': unreferenced formal parameter
    388 TEMPLATE_VBoxLibCryptoBldProg_CFLAGS.win    += -wd4132 # curve25519.c(5497): warning C4132: 'allzeroes': const object should be initialized
    389 TEMPLATE_VBoxLibCryptoBldProg_CFLAGS.win    += -wd4189 # eng_list.c(373): warning C4189: 'load_dir': local variable is initialized but not referenced
    390 TEMPLATE_VBoxLibCryptoBldProg_CFLAGS.win    += -wd4245 # bn_div.c(353): warning C4245: '=': conversion from '__int64' to 'unsigned __int64', signed/unsigned mismatch
    391 TEMPLATE_VBoxLibCryptoBldProg_CFLAGS.win    += -wd4255 # ctype.c(314): warning C4255: 'ossl_c_locale': no function prototype given: converting '()' to '(void)'
    392 TEMPLATE_VBoxLibCryptoBldProg_CFLAGS.win    += -wd4267 # p12_utl.c(23): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data
    393 TEMPLATE_VBoxLibCryptoBldProg_CFLAGS.win    += -wd4389 # encoder_pkey.c(110): warning C4389: '!=': signed/unsigned mismatch
    394 TEMPLATE_VBoxLibCryptoBldProg_CFLAGS.win    += -wd4668 # limits.h(70): warning C4668: '__STDC_WANT_SECURE_LIB__' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
    395 TEMPLATE_VBoxLibCryptoBldProg_CFLAGS.win    += -wd4702 # ctrl_params_translate.c(681) : warning C4702: unreachable code
    396 TEMPLATE_VBoxLibCryptoBldProg_CFLAGS.freebsd = $(TEMPLATE_VBoxAdvBldProg_CFLAGS.freebsd) $(subst $(TEMPLATE_VBoxR3RuntimeDllNonPedantic_CFLAGS.freebsd),, $(TEMPLATE_LibCrypto_CFLAGS.freebsd))
    397 TEMPLATE_VBoxLibCryptoBldProg_INCS           = $(TEMPLATE_LibCrypto_INCS) $(TEMPLATE_VBoxAdvBldProg_INCS)
    398 TEMPLATE_VBoxLibCryptoBldProg_INTERMEDIATES = $(TEMPLATE_VBoxAdvBldProg_INTERMEDIATES) $(TEMPLATE_LibCrypto_INTERMEDIATES)
    399 
    400 TEMPLATE_VBoxSubLibCryptoBldProg = Build program template a OpenSSL crypto sub-library.
    401 TEMPLATE_VBoxSubLibCryptoBldProg_EXTENDS    := VBoxLibCryptoBldProg
    402 TEMPLATE_VBoxSubLibCryptoBldProg_INSTTYPE    = none
     382 TEMPLATE_VBoxLibCryptoBldProg = Build program template the OpenSSL crypto library.
     383 TEMPLATE_VBoxLibCryptoBldProg_EXTENDS      := VBoxAdvBldProg
     384 TEMPLATE_VBoxLibCryptoBldProg_DEFS          = $(TEMPLATE_VBoxAdvBldProg_DEFS) $(TEMPLATE_LibCrypto_DEFS)
     385 TEMPLATE_VBoxLibCryptoBldProg_CFLAGS.win    = $(TEMPLATE_VBoxAdvBldProg_CFLAGS.win) $(subst $(TEMPLATE_VBoxR3RuntimeDllNonPedantic_CFLAGS.win),, $(TEMPLATE_LibCrypto_CFLAGS.win))
     386 TEMPLATE_VBoxLibCryptoBldProg_CFLAGS.win   += -wd4057 # refcount.h(137): warning C4057: 'function': 'volatile long *' differs in indirection to slightly different base types from 'volatile int *'
     387 TEMPLATE_VBoxLibCryptoBldProg_CFLAGS.win   += -wd4100 # refcount.h(135): warning C4100: 'lock': unreferenced formal parameter
     388 TEMPLATE_VBoxLibCryptoBldProg_CFLAGS.win   += -wd4132 # curve25519.c(5497): warning C4132: 'allzeroes': const object should be initialized
     389 TEMPLATE_VBoxLibCryptoBldProg_CFLAGS.win   += -wd4189 # eng_list.c(373): warning C4189: 'load_dir': local variable is initialized but not referenced
     390 TEMPLATE_VBoxLibCryptoBldProg_CFLAGS.win   += -wd4245 # bn_div.c(353): warning C4245: '=': conversion from '__int64' to 'unsigned __int64', signed/unsigned mismatch
     391 TEMPLATE_VBoxLibCryptoBldProg_CFLAGS.win   += -wd4255 # ctype.c(314): warning C4255: 'ossl_c_locale': no function prototype given: converting '()' to '(void)'
     392 TEMPLATE_VBoxLibCryptoBldProg_CFLAGS.win   += -wd4267 # p12_utl.c(23): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data
     393 TEMPLATE_VBoxLibCryptoBldProg_CFLAGS.win   += -wd4389 # encoder_pkey.c(110): warning C4389: '!=': signed/unsigned mismatch
     394 TEMPLATE_VBoxLibCryptoBldProg_CFLAGS.win   += -wd4668 # limits.h(70): warning C4668: '__STDC_WANT_SECURE_LIB__' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
     395 TEMPLATE_VBoxLibCryptoBldProg_CFLAGS.win   += -wd4702 # ctrl_params_translate.c(681) : warning C4702: unreachable code
     396 TEMPLATE_VBoxLibCryptoBldProg_CFLAGS.freebsd = $(TEMPLATE_VBoxAdvBldProg_CFLAGS.freebsd) $(subst $(TEMPLATE_VBoxR3RuntimeDllNonPedantic_CFLAGS.freebsd),, $(TEMPLATE_LibCrypto_CFLAGS.freebsd))
     397 TEMPLATE_VBoxLibCryptoBldProg_INCS          = $(TEMPLATE_LibCrypto_INCS) $(TEMPLATE_VBoxAdvBldProg_INCS)
     398 TEMPLATE_VBoxLibCryptoBldProg_INTERMEDIATES = $(TEMPLATE_VBoxAdvBldProg_INTERMEDIATES) $(TEMPLATE_LibCrypto_INTERMEDIATES)
     399
     400 TEMPLATE_VBoxSubLibCryptoBldProg = Build program template a OpenSSL crypto sub-library.
     401 TEMPLATE_VBoxSubLibCryptoBldProg_EXTENDS   := VBoxLibCryptoBldProg
     402 TEMPLATE_VBoxSubLibCryptoBldProg_INSTTYPE   = none
    403403endif # VBOX_WITH_BLD_RTSIGNTOOL_SIGNING
    404404
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