Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/libxmlrpc: add openssl optional dependency
@ 2020-06-22  5:47 Fabrice Fontaine
  2020-06-22  9:07 ` Peter Korsgaard
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Fabrice Fontaine @ 2020-06-22  5:47 UTC (permalink / raw)
  To: buildroot

Without this patch, openssl_abyss is enabled if openssl is built before
libxmlrpc

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/libxmlrpc/libxmlrpc.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/libxmlrpc/libxmlrpc.mk b/package/libxmlrpc/libxmlrpc.mk
index 54db9f1f89..f9925b74ca 100644
--- a/package/libxmlrpc/libxmlrpc.mk
+++ b/package/libxmlrpc/libxmlrpc.mk
@@ -39,6 +39,13 @@ ifeq ($(BR2_STATIC_LIBS),y)
 LIBXMLRPC_STATIC_OPTS = SHARED_LIB_TYPE=NONE MUST_BUILD_SHLIB=N
 endif
 
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+LIBXMLRPC_DEPENDENCIES = host-pkgconf openssl
+LIBXMLRPC_CONF_OPTS = --enable-abyss-openssl
+else
+LIBXMLRPC_CONF_OPTS = --disable-abyss-openssl
+endif
+
 LIBXMLRPC_MAKE_OPTS += $(LIBXMLRPC_STATIC_OPTS)
 LIBXMLRPC_INSTALL_STAGING_OPTS = $(LIBXMLRPC_STATIC_OPTS) \
 	DESTDIR=$(STAGING_DIR) install
-- 
2.26.2

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

* [Buildroot] [PATCH 1/1] package/libxmlrpc: add openssl optional dependency
  2020-06-22  5:47 [Buildroot] [PATCH 1/1] package/libxmlrpc: add openssl optional dependency Fabrice Fontaine
@ 2020-06-22  9:07 ` Peter Korsgaard
  2020-06-22 20:25 ` Yann E. MORIN
  2020-07-16 15:03 ` Peter Korsgaard
  2 siblings, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2020-06-22  9:07 UTC (permalink / raw)
  To: buildroot

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

 > Without this patch, openssl_abyss is enabled if openssl is built before
 > libxmlrpc

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

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

* [Buildroot] [PATCH 1/1] package/libxmlrpc: add openssl optional dependency
  2020-06-22  5:47 [Buildroot] [PATCH 1/1] package/libxmlrpc: add openssl optional dependency Fabrice Fontaine
  2020-06-22  9:07 ` Peter Korsgaard
@ 2020-06-22 20:25 ` Yann E. MORIN
  2020-07-16 15:03 ` Peter Korsgaard
  2 siblings, 0 replies; 4+ messages in thread
From: Yann E. MORIN @ 2020-06-22 20:25 UTC (permalink / raw)
  To: buildroot

On 2020-06-22 07:47 +0200, Fabrice Fontaine spake thusly:
> Without this patch, openssl_abyss is enabled if openssl is built before
> libxmlrpc
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/libxmlrpc/libxmlrpc.mk | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/package/libxmlrpc/libxmlrpc.mk b/package/libxmlrpc/libxmlrpc.mk
> index 54db9f1f89..f9925b74ca 100644
> --- a/package/libxmlrpc/libxmlrpc.mk
> +++ b/package/libxmlrpc/libxmlrpc.mk
> @@ -39,6 +39,13 @@ ifeq ($(BR2_STATIC_LIBS),y)
>  LIBXMLRPC_STATIC_OPTS = SHARED_LIB_TYPE=NONE MUST_BUILD_SHLIB=N
>  endif
>  
> +ifeq ($(BR2_PACKAGE_OPENSSL),y)
> +LIBXMLRPC_DEPENDENCIES = host-pkgconf openssl
> +LIBXMLRPC_CONF_OPTS = --enable-abyss-openssl
> +else
> +LIBXMLRPC_CONF_OPTS = --disable-abyss-openssl
> +endif

These should have been append-assignment, using '+=' not '='. This would
have been caught by rinning check-package:

    $ make check-package
    package/libxmlrpc/libxmlrpc.mk:43: conditional override of variable LIBXMLRPC_DEPENDENCIES
    package/libxmlrpc/libxmlrpc.mk:44: conditional override of variable LIBXMLRPC_CONF_OPTS
    package/libxmlrpc/libxmlrpc.mk:46: conditional override of variable LIBXMLRPC_CONF_OPTS

Regards,
Yann E. MORIN.

>  LIBXMLRPC_MAKE_OPTS += $(LIBXMLRPC_STATIC_OPTS)
>  LIBXMLRPC_INSTALL_STAGING_OPTS = $(LIBXMLRPC_STATIC_OPTS) \
>  	DESTDIR=$(STAGING_DIR) install
> -- 
> 2.26.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/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.  |
'------------------------------^-------^------------------^--------------------'

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

* [Buildroot] [PATCH 1/1] package/libxmlrpc: add openssl optional dependency
  2020-06-22  5:47 [Buildroot] [PATCH 1/1] package/libxmlrpc: add openssl optional dependency Fabrice Fontaine
  2020-06-22  9:07 ` Peter Korsgaard
  2020-06-22 20:25 ` Yann E. MORIN
@ 2020-07-16 15:03 ` Peter Korsgaard
  2 siblings, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2020-07-16 15:03 UTC (permalink / raw)
  To: buildroot

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

 > Without this patch, openssl_abyss is enabled if openssl is built before
 > libxmlrpc

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2020.02.x and 2020.05.x, thanks.

-- 
Bye, Peter Korsgaard

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

end of thread, other threads:[~2020-07-16 15:03 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-22  5:47 [Buildroot] [PATCH 1/1] package/libxmlrpc: add openssl optional dependency Fabrice Fontaine
2020-06-22  9:07 ` Peter Korsgaard
2020-06-22 20:25 ` Yann E. MORIN
2020-07-16 15:03 ` Peter Korsgaard

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