aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2019-12-30 21:36:14 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2020-04-08 14:38:31 +0200
commitb7b596724623468e215521bd33fac7144495452b (patch)
treea33ac75a1c85812b172a3945e898111d838003ad
parentd8d0cada48e1ca90a38912ed61f69e91712bff20 (diff)
downloadbuildroot-b7b596724623468e215521bd33fac7144495452b.tar.gz
buildroot-b7b596724623468e215521bd33fac7144495452b.tar.bz2
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> (cherry picked from commit 27a2073a2d3beb32af199ad0e2f1efb36f431cce) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/libopenssl/Config.in16
-rw-r--r--package/openssl/Config.in16
2 files changed, 16 insertions, 16 deletions
diff --git a/package/libopenssl/Config.in b/package/libopenssl/Config.in
index 5ca19b38f8..881518d1cb 100644
--- a/package/libopenssl/Config.in
+++ b/package/libopenssl/Config.in
@@ -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
diff --git a/package/openssl/Config.in b/package/openssl/Config.in
index b0837ba303..791f96280c 100644
--- a/package/openssl/Config.in
+++ b/package/openssl/Config.in
@@ -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