Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v2,1/1] package/libldns: fix libressl build
@ 2023-12-12 20:59 Fabrice Fontaine
  2023-12-18 17:51 ` Yann E. MORIN
  2024-01-07 11:15 ` Peter Korsgaard
  0 siblings, 2 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2023-12-12 20:59 UTC (permalink / raw)
  To: buildroot; +Cc: Bernd Kuhls, Fabrice Fontaine

Fix the following build failure raised since bump of libressl to version
3.8.2 in commit 21eca49ed5110872407b76ab9337d2877c4cda24:

./keys.c:167:35: error: 'ENGINE_METHOD_ALL' undeclared (first use in this function)
  167 |         if(!ENGINE_set_default(e, ENGINE_METHOD_ALL)) {
      |                                   ^~~~~~~~~~~~~~~~~

Fixes:
 - http://autobuild.buildroot.org/results/37cc05b78a7004caa1b45d896121f059a4f8ca00

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2 (after review of Yann E. Morin):
 - Disable gost without engines instead of patching code

 package/libldns/libldns.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/libldns/libldns.mk b/package/libldns/libldns.mk
index 06564e3d9f..d6af6a2b97 100644
--- a/package/libldns/libldns.mk
+++ b/package/libldns/libldns.mk
@@ -17,7 +17,6 @@ LIBLDNS_CONF_OPTS = \
 	--with-ssl=$(STAGING_DIR)/usr \
 	--enable-dane \
 	--enable-ecdsa \
-	--enable-gost \
 	--enable-sha2 \
 	--without-examples \
 	--without-p5-dns-ldns \
@@ -30,6 +29,12 @@ else
 LIBLDNS_CONF_OPTS += --disable-dane-verify
 endif
 
+ifeq ($(BR2_PACKAGE_LIBOPENSSL_ENGINES),y)
+LIBLDNS_CONF_OPTS += --enable-gost
+else
+LIBLDNS_CONF_OPTS += --disable-gost
+endif
+
 ifeq ($(BR2_STATIC_LIBS),y)
 LIBLDNS_DEPENDENCIES += host-pkgconf
 # missing -lz breaks configure, add it using pkgconf
-- 
2.42.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [Buildroot] [PATCH v2,1/1] package/libldns: fix libressl build
  2023-12-12 20:59 [Buildroot] [PATCH v2,1/1] package/libldns: fix libressl build Fabrice Fontaine
@ 2023-12-18 17:51 ` Yann E. MORIN
  2024-01-07 11:15 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2023-12-18 17:51 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: Bernd Kuhls, buildroot

Fabrice, All,

On 2023-12-12 21:59 +0100, Fabrice Fontaine spake thusly:
> Fix the following build failure raised since bump of libressl to version
> 3.8.2 in commit 21eca49ed5110872407b76ab9337d2877c4cda24:
> 
> ./keys.c:167:35: error: 'ENGINE_METHOD_ALL' undeclared (first use in this function)
>   167 |         if(!ENGINE_set_default(e, ENGINE_METHOD_ALL)) {
>       |                                   ^~~~~~~~~~~~~~~~~
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/37cc05b78a7004caa1b45d896121f059a4f8ca00
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
> Changes v1 -> v2 (after review of Yann E. Morin):
>  - Disable gost without engines instead of patching code
> 
>  package/libldns/libldns.mk | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/package/libldns/libldns.mk b/package/libldns/libldns.mk
> index 06564e3d9f..d6af6a2b97 100644
> --- a/package/libldns/libldns.mk
> +++ b/package/libldns/libldns.mk
> @@ -17,7 +17,6 @@ LIBLDNS_CONF_OPTS = \
>  	--with-ssl=$(STAGING_DIR)/usr \
>  	--enable-dane \
>  	--enable-ecdsa \
> -	--enable-gost \
>  	--enable-sha2 \
>  	--without-examples \
>  	--without-p5-dns-ldns \
> @@ -30,6 +29,12 @@ else
>  LIBLDNS_CONF_OPTS += --disable-dane-verify
>  endif
>  
> +ifeq ($(BR2_PACKAGE_LIBOPENSSL_ENGINES),y)
> +LIBLDNS_CONF_OPTS += --enable-gost
> +else
> +LIBLDNS_CONF_OPTS += --disable-gost
> +endif
> +
>  ifeq ($(BR2_STATIC_LIBS),y)
>  LIBLDNS_DEPENDENCIES += host-pkgconf
>  # missing -lz breaks configure, add it using pkgconf
> -- 
> 2.42.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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [Buildroot] [PATCH v2,1/1] package/libldns: fix libressl build
  2023-12-12 20:59 [Buildroot] [PATCH v2,1/1] package/libldns: fix libressl build Fabrice Fontaine
  2023-12-18 17:51 ` Yann E. MORIN
@ 2024-01-07 11:15 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2024-01-07 11:15 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: Bernd Kuhls, buildroot

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Fix the following build failure raised since bump of libressl to version
 > 3.8.2 in commit 21eca49ed5110872407b76ab9337d2877c4cda24:

 > ./keys.c:167:35: error: 'ENGINE_METHOD_ALL' undeclared (first use in this function)
 >   167 |         if(!ENGINE_set_default(e, ENGINE_METHOD_ALL)) {
 >       |                                   ^~~~~~~~~~~~~~~~~

 > Fixes:
 >  - http://autobuild.buildroot.org/results/37cc05b78a7004caa1b45d896121f059a4f8ca00

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 > ---
 > Changes v1 -> v2 (after review of Yann E. Morin):
 >  - Disable gost without engines instead of patching code

Committed to 2023.11.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2024-01-07 11:16 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-12 20:59 [Buildroot] [PATCH v2,1/1] package/libldns: fix libressl build Fabrice Fontaine
2023-12-18 17:51 ` Yann E. MORIN
2024-01-07 11:15 ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox