mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-11-29 15:14:17 +01:00
Remove pkcs11-helper option
In preparation for removing X.509 and PKCS11 from Mbed Crypto, remove pkcs11-helper. It won't be relevant after X.509 and PKCS11 are removed.
This commit is contained in:
parent
521dbc67da
commit
d832f187f7
@ -5,7 +5,6 @@ else()
|
|||||||
project("mbed TLS" C)
|
project("mbed TLS" C)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
option(USE_PKCS11_HELPER_LIBRARY "Build mbed TLS with the pkcs11-helper library." OFF)
|
|
||||||
option(ENABLE_ZLIB_SUPPORT "Build mbed TLS with zlib library." OFF)
|
option(ENABLE_ZLIB_SUPPORT "Build mbed TLS with zlib library." OFF)
|
||||||
|
|
||||||
option(ENABLE_PROGRAMS "Build mbed TLS programs." ON)
|
option(ENABLE_PROGRAMS "Build mbed TLS programs." ON)
|
||||||
|
@ -123,10 +123,6 @@ if(HAIKU)
|
|||||||
set(libs ${libs} network)
|
set(libs ${libs} network)
|
||||||
endif(HAIKU)
|
endif(HAIKU)
|
||||||
|
|
||||||
if(USE_PKCS11_HELPER_LIBRARY)
|
|
||||||
set(libs ${libs} pkcs11-helper)
|
|
||||||
endif(USE_PKCS11_HELPER_LIBRARY)
|
|
||||||
|
|
||||||
if(ENABLE_ZLIB_SUPPORT)
|
if(ENABLE_ZLIB_SUPPORT)
|
||||||
set(libs ${libs} ${ZLIB_LIBRARIES})
|
set(libs ${libs} ${ZLIB_LIBRARIES})
|
||||||
endif(ENABLE_ZLIB_SUPPORT)
|
endif(ENABLE_ZLIB_SUPPORT)
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
|
|
||||||
# To compile on SunOS: add "-lsocket -lnsl" to LDFLAGS
|
# To compile on SunOS: add "-lsocket -lnsl" to LDFLAGS
|
||||||
# To compile with PKCS11: add "-lpkcs11-helper" to LDFLAGS
|
|
||||||
|
|
||||||
CFLAGS ?= -O2
|
CFLAGS ?= -O2
|
||||||
WARNING_CFLAGS ?= -Wall -W -Wdeclaration-after-statement
|
WARNING_CFLAGS ?= -Wall -W -Wdeclaration-after-statement
|
||||||
|
@ -2,10 +2,6 @@ set(libs
|
|||||||
mbedtls
|
mbedtls
|
||||||
)
|
)
|
||||||
|
|
||||||
if(USE_PKCS11_HELPER_LIBRARY)
|
|
||||||
set(libs ${libs} pkcs11-helper)
|
|
||||||
endif(USE_PKCS11_HELPER_LIBRARY)
|
|
||||||
|
|
||||||
if(ENABLE_ZLIB_SUPPORT)
|
if(ENABLE_ZLIB_SUPPORT)
|
||||||
set(libs ${libs} ${ZLIB_LIBRARIES})
|
set(libs ${libs} ${ZLIB_LIBRARIES})
|
||||||
endif(ENABLE_ZLIB_SUPPORT)
|
endif(ENABLE_ZLIB_SUPPORT)
|
||||||
|
@ -2,10 +2,6 @@ set(libs
|
|||||||
mbedtls
|
mbedtls
|
||||||
)
|
)
|
||||||
|
|
||||||
if(USE_PKCS11_HELPER_LIBRARY)
|
|
||||||
set(libs ${libs} pkcs11-helper)
|
|
||||||
endif(USE_PKCS11_HELPER_LIBRARY)
|
|
||||||
|
|
||||||
if(ENABLE_ZLIB_SUPPORT)
|
if(ENABLE_ZLIB_SUPPORT)
|
||||||
set(libs ${libs} ${ZLIB_LIBRARIES})
|
set(libs ${libs} ${ZLIB_LIBRARIES})
|
||||||
endif(ENABLE_ZLIB_SUPPORT)
|
endif(ENABLE_ZLIB_SUPPORT)
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
|
|
||||||
# To compile on SunOS: add "-lsocket -lnsl" to LDFLAGS
|
# To compile on SunOS: add "-lsocket -lnsl" to LDFLAGS
|
||||||
# To compile with PKCS11: add "-lpkcs11-helper" to LDFLAGS
|
|
||||||
|
|
||||||
CFLAGS ?= -O2
|
CFLAGS ?= -O2
|
||||||
WARNING_CFLAGS ?= -Wall -W -Wdeclaration-after-statement -Wno-unused-function -Wno-unused-value
|
WARNING_CFLAGS ?= -Wall -W -Wdeclaration-after-statement -Wno-unused-function -Wno-unused-value
|
||||||
|
Loading…
Reference in New Issue
Block a user