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>

diff --git a/package/libopenssl/Config.in b/package/libopenssl/Config.in
index 5ca19b38f8f335b4faff691a9f75610768b5b154..881518d1cb9af9420915cbc02180662a1041330d 100644 (file)
--- 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 4d37a3ecf9b09f4374a7f9cc581d1274f9b671cd..01d3549aef9e899ef0375af20853883dabbe5ee8 100644 (file)
--- 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