package/libopenssl: move options

Since e3159cad71 (package/libopenssl: move target arch selection
to Config.in), we have a Config.in that contains a few options to
configure libopenssl (openSSL, the original).

As such, it makes sense to move the remaining options there too.

We also move the condition there, mimicking what is done for the
external toolchains' options too.

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Cc: Matt Weber <matthew.weber@rockwellcollins.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Yann E. MORIN 2019-12-30 21:36:14 +01:00
parent b3bdde2b1b
commit 27a2073a2d
2 changed files with 16 additions and 16 deletions

View File

@ -1,3 +1,5 @@
if BR2_PACKAGE_LIBOPENSSL
# 4xx PowerPC cores seem to have trouble with openssl's ASM
# optimizations
config BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH_LINUX_PPC
@ -29,3 +31,17 @@ config BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH
# https://github.com/openssl/openssl/issues/9839
default "linux-generic64 no-asm" if BR2_ARCH_IS_64
default "linux-generic32 no-asm"
config BR2_PACKAGE_LIBOPENSSL_BIN
bool "openssl binary"
help
Install the openssl binary and the associated helper scripts
to the target file system. This is a command line tool for
doing various cryptographic stuff.
config BR2_PACKAGE_LIBOPENSSL_ENGINES
bool "openssl additional engines"
help
Install additional encryption engine libraries.
endif # BR2_PACKAGE_LIBOPENSSL

View File

@ -29,24 +29,8 @@ config BR2_PACKAGE_LIBOPENSSL
Note: Some helper scripts need perl.
if BR2_PACKAGE_LIBOPENSSL
config BR2_PACKAGE_LIBOPENSSL_BIN
bool "openssl binary"
help
Install the openssl binary and the associated helper scripts
to the target file system. This is a command line tool for
doing various cryptographic stuff.
config BR2_PACKAGE_LIBOPENSSL_ENGINES
bool "openssl additional engines"
help
Install additional encryption engine libraries.
source "package/libopenssl/Config.in"
endif
config BR2_PACKAGE_LIBRESSL
bool "libressl"
depends on !BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL