Re: [Buildroot] [PATCH v1 8/8] package/openssl: move libopenssl/libressl source statemetns outside of the choice

["Yann E. MORIN" <yann.morin.1998@free.fr>]

> https://lists.buildroot.org/mailman/listinfo/buildroot

Peter, All,

On 2024-05-06 16:45 +0200, Peter Seiderer via buildroot spake thusly:
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
> Notes/ToDo:
> - with this solution the external support needs to be splitted into
>   two imports/lines...

NMot sure I understand wht you meant here...

> ---
>  package/openssl/Config.in | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/package/openssl/Config.in b/package/openssl/Config.in
> index 3d14988d99..fcf996f03f 100644
> --- a/package/openssl/Config.in
> +++ b/package/openssl/Config.in
> @@ -28,8 +28,6 @@ config BR2_PACKAGE_LIBOPENSSL
>  
>  	  Note: Some helper scripts need perl.
>  
> -source "package/libopenssl/Config.in"
> -
>  config BR2_PACKAGE_LIBRESSL
>  	bool "libressl"
>  	depends on !BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
> @@ -44,13 +42,14 @@ config BR2_PACKAGE_LIBRESSL
>  
>  	  http://www.libressl.org/
>  
> -source "package/libressl/Config.in"
> -
>  # openssl from br2-external trees, if any
>  source "$(BASE_DIR)/.br2-external.in.openssl"

This leaves one 'source' statement in te choice, which is no longer
accepted, AFAIU.

>  endchoice
>  
> +source "package/libopenssl/Config.in"
> +source "package/libressl/Config.in"

I think the best solution is to move the if-endif conditional block out
of package/libopenssl/Config.in back into package/openssl/Config.in, and
add a new choice entry, so that basically we end up with something lie;

    choice
        bool "ssl library"

    config BR2_PACKAGE_LIBOPENSSL
        bool "openssl"

    config BR2_PACKAGE_LIBRESSL
        bool "libressl"

    config BR2_PACKAGE_OPENSSL_EXTERNAL
        bool "from an external tree"
        depends on $BR2_EXTERNAL != ""  # Or something along those lines, adapt

    endchoice

    if BR2_PACKAGE_LIBOPENSSL
    source "package/libopenssl/Config.in"
    endif

    if BR2_PACKAGE_LIBRESSL
    source "package/libressl/Config.in"
    endif

    if BR2_PACKAGE_OPENSSL_EXTERNAL
    source "$(BASE_DIR)/.br2-external.in.openssl"
    endif

Basically, that would make for an uglier state, but that's the best we
can do given the new limitsations introduced by upstream kconfig...

Thoughts?

Regards,
Yann E. MORIN.

>  config BR2_PACKAGE_HAS_OPENSSL
>  	bool
>  
> -- 
> 2.44.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot