Message ID | 3b8aa710fabea4b4c22d4bc2c0944bdc976c7d18.1577738159.git.yann.morin.1998@free.fr |
---|---|
State | Accepted |
Headers | show |
Series | [1/2] package/libopenssl: move options | expand |
On Mon, 30 Dec 2019 21:36:14 +0100 "Yann E. MORIN" <yann.morin.1998@free.fr> wrote: > 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>
Yann, On Mon, Dec 30, 2019 at 4:33 PM Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote: > > On Mon, 30 Dec 2019 21:36:14 +0100 > "Yann E. MORIN" <yann.morin.1998@free.fr> wrote: > > > 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> > Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com>
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 4d37a3ecf9..01d3549aef 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
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> --- package/libopenssl/Config.in | 16 ++++++++++++++++ package/openssl/Config.in | 16 ---------------- 2 files changed, 16 insertions(+), 16 deletions(-)