Skip to contentSkip to conversation

package/libxmlrpc: add openssl optional dependency

PATCH New Fabrice Fontaine 3 participants 4 messages Jun 22, 2020 – Jul 16, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/libxmlrpc: add openssl optional dependency

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

---
 package/libxmlrpc/libxmlrpc.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/libxmlrpc/libxmlrpc.mk +7 -0
index 54db9f1f89..f9925b74ca 100644
@@ -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
Signature · 1 line
2.26.2
#1 lore raw

PATCH 1/1 package/libxmlrpc: add openssl optional dependency

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

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

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 package/libxmlrpc: add openssl optional dependency

In reply to Fabrice Fontaine

On 2020-06-22 07:47 +0200, Fabrice Fontaine spake thusly:

Quoted 13 lines

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

---
 package/libxmlrpc/libxmlrpc.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/libxmlrpc/libxmlrpc.mk +0 -0
index 54db9f1f89..f9925b74ca 100644

package/libxmlrpc/libxmlrpc.mk ifeq ($(BR2_STATIC_LIBS),y) · line 47

Quoted 9 lines
package/libxmlrpc/libxmlrpc.mk +6 -0
@@ -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.

Quoted 10 lines
package/libxmlrpc/libxmlrpc.mk +0 -0
 LIBXMLRPC_MAKE_OPTS += $(LIBXMLRPC_STATIC_OPTS)
 LIBXMLRPC_INSTALL_STAGING_OPTS = $(LIBXMLRPC_STATIC_OPTS) \
 	DESTDIR=$(STAGING_DIR) install
Signature · 6 lines
2.26.2

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'