Skip to contentSkip to conversation

Bump libxmlrpc

PATCH New Alvaro G. M 2 participants 15 messages Nov 2, 2016 – Dec 4, 2016 1 message not in the archive Kbuild

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Alvaro G. M

author
#1 lore raw

PATCH 1/1 Bump libxmlrpc

Signed-off-by Alvaro Gamez <[email protected]>
---
 package/libxmlrpc/0001-fix-gennmtab-build.patch    |  2 +-
 .../libxmlrpc/0004-use-correct-curl-config.patch   | 36 +++-------------------
 package/libxmlrpc/libxmlrpc.hash                   |  2 +-
 package/libxmlrpc/libxmlrpc.mk                     |  4 +--
 4 files changed, 9 insertions(+), 35 deletions(-)
package/libxmlrpc/0001-fix-gennmtab-build.patch +1 -1
index 8cdd932..e98e5cb 100644
@@ -19,7 +19,7 @@ Index: b/lib/expat/gennmtab/Makefile
 +	$(CC_FOR_BUILD) -c $< -o $@ $(CFLAGS_FOR_BUILD) $(INCLUDES)
  
  gennmtab:%:%.o
--	$(BUILDTOOL_CCLD) -o $@ $(LDFLAGS) $^
+-	$(BUILDTOOL_CCLD) -o $@ $(LDFLAGS_ALL) $^
 +	$(CC_FOR_BUILD) -o $@ $(LDFLAGS_FOR_BUILD) $^
  
  include depend.mk
package/libxmlrpc/0004-use-correct-curl-config.patch +5 -31
index b581643..f2f1c55 100644
@@ -12,15 +12,15 @@ Index: b/src/Makefile
 ===================================================================
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -56,7 +56,7 @@
-   TRANSPORT_MODS += blddir/lib/curl_transport/curltransaction
-   TRANSPORT_MODS += blddir/lib/curl_transport/curlmulti
-   TRANSPORT_MODS += blddir/lib/curl_transport/lock_pthread
+@@ -57,7 +57,7 @@
+   TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/xmlrpc_curl_transport
+   TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/curltransaction
+   TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/curlmulti
 -  TRANSPORT_LIBDEP += $(shell curl-config --libs)
 +  TRANSPORT_LIBDEP += $(shell $CURL_CONFIG --libs)
+   TRANSPORT_INCLUDES += -Isrcdir/lib/curl_transport
  endif
  ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes)
-   TRANSPORT_MODS += blddir/lib/libwww_transport/xmlrpc_libwww_transport
 Index: b/config.mk.in
 ===================================================================
 --- a/config.mk.in

@@ -68,29 +68,3 @@ Index: b/lib/curl_transport/Makefile
  # We expect that curl-config --cflags just gives us -I options, because
  # we need just the -I options for 'make dep'.  Plus, it's scary to think
  # of what any other compiler flag would do to our compile.
-Index: b/src/cpp/test/Makefile
-===================================================================
---- a/src/cpp/test/Makefile
-+++ b/src/cpp/test/Makefile
-@@ -20,7 +20,7 @@
- LIBS := $(shell $(XMLRPC_C_CONFIG) client --ldadd)
- 
- ifeq ($(MUST_BUILD_CURL_CLIENT),yes)
--  LIBS += $(shell curl-config --libs)
-+  LIBS += $(shell $(CURL_CONFIG) --libs)
- endif
- ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes)
-   LIBS += $(shell libwww-config --libs)
-Index: b/tools/common.mk
-===================================================================
---- a/tools/common.mk
-+++ b/tools/common.mk
-@@ -15,7 +15,7 @@
-   CLIENT_LDLIBS += $(shell libwww-config --libs)
- endif
- ifeq ($(MUST_BUILD_CURL_CLIENT),yes)
--  CLIENT_LDLIBS += $(shell curl-config --libs)
-+  CLIENT_LDLIBS += $(shell $(CURL_CONFIG) --libs)
- endif
- ifeq ($(MUST_BUILD_WININET_CLIENT),yes)
-   CLIENT_LDLIBS += $(shell wininet-config --libs)
package/libxmlrpc/libxmlrpc.hash +1 -1
index d37fcfc..0bcc646 100644
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 8ae6ed4ec57d50ed132b1150fc5258346eef3e291501a564f14fa97586902f98 xmlrpc-c-1.25.30.tgz
+sha256 b82d871a6ef63bf0c29b7b303e4ab723a4a004f16ab96b341ccab30b2609edec xmlrpc-c-1.39.10.tgz
package/libxmlrpc/libxmlrpc.mk +2 -2
index 03a7095..e88f643 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBXMLRPC_VERSION = 1.25.30
+LIBXMLRPC_VERSION = 1.39.10
 LIBXMLRPC_SOURCE = xmlrpc-c-$(LIBXMLRPC_VERSION).tgz
 LIBXMLRPC_SITE = http://downloads.sourceforge.net/project/xmlrpc-c/Xmlrpc-c%20Super%20Stable/$(LIBXMLRPC_VERSION)
 LIBXMLRPC_LICENSE = BSD-3c (xml-rpc main code and abyss web server), BSD like (lib/expat), Python 1.5.2 license (parts of xmlrpc_base64.c)

@@ -39,7 +39,7 @@ ifeq ($(BR2_STATIC_LIBS),y)
 LIBXMLRPC_STATIC_OPTS = SHARED_LIB_TYPE=NONE MUST_BUILD_SHLIB=N
 endif
 
-LIBXMLRPC_MAKE_OPTS = $(LIBXMLRPC_STATIC_OPTS)
+LIBXMLRPC_MAKE_OPTS = $(LIBXMLRPC_STATIC_OPTS) AR="$(TARGET_AR)" RANLIB="$(TARGET_RANLIB)"
 LIBXMLRPC_INSTALL_STAGING_OPTS = $(LIBXMLRPC_STATIC_OPTS) \
 	DESTDIR=$(STAGING_DIR) install
 LIBXMLRPC_INSTALL_TARGET_OPTS = $(LIBXMLRPC_STATIC_OPTS) \
Signature · 1 line
2.7.0
#2 lore raw

PATCH 1/1 Bump libxmlrpc

Hello,

Quoted 1 line · Alvaro G. M
Signed-off-by Alvaro Gamez <[email protected]>

Thanks for your contribution. However, there are a few issues with it:

- The title should be:

libxmlrpc: bump to version xyz

- The commit log should contain a lot more details, especially:

* what changes are made to the patches

* why you are adding the AR and RANLIB definitions in MAKE_OPTS

Could you rework your patch accordingly?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
author
#3 lore raw

PATCH 1/1 Bump libxmlrpc

Sure! I'll need a couple days though.

Best regards

El 2/11/2016 23:26, "Thomas Petazzoni" <[email protected]> escribi?:

Quoted 19 lines

Hello,

Quoted 1 line · Alvaro G. M
Signed-off-by Alvaro Gamez <[email protected]>

Thanks for your contribution. However, there are a few issues with it:

- The title should be:

libxmlrpc: bump to version xyz

- The commit log should contain a lot more details, especially:

* what changes are made to the patches

* why you are adding the AR and RANLIB definitions in MAKE_OPTS

Could you rework your patch accordingly?

Quoted 8 lines

Thanks!

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20161103/986f112a/attachment.html>

author
#4 lore raw

PATCH v2 1/1 Bump libxmlrpc to version 1.39.10

In reply to Thomas Petazzoni

Previous version patches are still needed, but they have been upgraded to apply cleanly.

Bumped version fixes compilation issue on some architectures (arm, microblaze).

Fixes:
http://autobuild.buildroot.net/results/c45530f34bf2074bd204c485615124df928f246c

Signed-off-by Alvaro Gamez <[email protected]>
---
 package/libxmlrpc/0001-fix-gennmtab-build.patch    |  2 +-
 .../libxmlrpc/0004-use-correct-curl-config.patch   | 36 +++-------------------
 package/libxmlrpc/libxmlrpc.hash                   |  2 +-
 package/libxmlrpc/libxmlrpc.mk                     |  4 +--
 4 files changed, 9 insertions(+), 35 deletions(-)
package/libxmlrpc/0001-fix-gennmtab-build.patch +1 -1
index 8cdd932..e98e5cb 100644
@@ -19,7 +19,7 @@ Index: b/lib/expat/gennmtab/Makefile
 +	$(CC_FOR_BUILD) -c $< -o $@ $(CFLAGS_FOR_BUILD) $(INCLUDES)
  
  gennmtab:%:%.o
--	$(BUILDTOOL_CCLD) -o $@ $(LDFLAGS) $^
+-	$(BUILDTOOL_CCLD) -o $@ $(LDFLAGS_ALL) $^
 +	$(CC_FOR_BUILD) -o $@ $(LDFLAGS_FOR_BUILD) $^
  
  include depend.mk
package/libxmlrpc/0004-use-correct-curl-config.patch +5 -31
index b581643..f2f1c55 100644
@@ -12,15 +12,15 @@ Index: b/src/Makefile
 ===================================================================
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -56,7 +56,7 @@
-   TRANSPORT_MODS += blddir/lib/curl_transport/curltransaction
-   TRANSPORT_MODS += blddir/lib/curl_transport/curlmulti
-   TRANSPORT_MODS += blddir/lib/curl_transport/lock_pthread
+@@ -57,7 +57,7 @@
+   TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/xmlrpc_curl_transport
+   TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/curltransaction
+   TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/curlmulti
 -  TRANSPORT_LIBDEP += $(shell curl-config --libs)
 +  TRANSPORT_LIBDEP += $(shell $CURL_CONFIG --libs)
+   TRANSPORT_INCLUDES += -Isrcdir/lib/curl_transport
  endif
  ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes)
-   TRANSPORT_MODS += blddir/lib/libwww_transport/xmlrpc_libwww_transport
 Index: b/config.mk.in
 ===================================================================
 --- a/config.mk.in

@@ -68,29 +68,3 @@ Index: b/lib/curl_transport/Makefile
  # We expect that curl-config --cflags just gives us -I options, because
  # we need just the -I options for 'make dep'.  Plus, it's scary to think
  # of what any other compiler flag would do to our compile.
-Index: b/src/cpp/test/Makefile
-===================================================================
---- a/src/cpp/test/Makefile
-+++ b/src/cpp/test/Makefile
-@@ -20,7 +20,7 @@
- LIBS := $(shell $(XMLRPC_C_CONFIG) client --ldadd)
- 
- ifeq ($(MUST_BUILD_CURL_CLIENT),yes)
--  LIBS += $(shell curl-config --libs)
-+  LIBS += $(shell $(CURL_CONFIG) --libs)
- endif
- ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes)
-   LIBS += $(shell libwww-config --libs)
-Index: b/tools/common.mk
-===================================================================
---- a/tools/common.mk
-+++ b/tools/common.mk
-@@ -15,7 +15,7 @@
-   CLIENT_LDLIBS += $(shell libwww-config --libs)
- endif
- ifeq ($(MUST_BUILD_CURL_CLIENT),yes)
--  CLIENT_LDLIBS += $(shell curl-config --libs)
-+  CLIENT_LDLIBS += $(shell $(CURL_CONFIG) --libs)
- endif
- ifeq ($(MUST_BUILD_WININET_CLIENT),yes)
-   CLIENT_LDLIBS += $(shell wininet-config --libs)
package/libxmlrpc/libxmlrpc.hash +1 -1
index d37fcfc..0bcc646 100644
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 8ae6ed4ec57d50ed132b1150fc5258346eef3e291501a564f14fa97586902f98 xmlrpc-c-1.25.30.tgz
+sha256 b82d871a6ef63bf0c29b7b303e4ab723a4a004f16ab96b341ccab30b2609edec xmlrpc-c-1.39.10.tgz
package/libxmlrpc/libxmlrpc.mk +1 -1
index 03a7095..e88f643 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBXMLRPC_VERSION = 1.25.30
+LIBXMLRPC_VERSION = 1.39.10
 LIBXMLRPC_SOURCE = xmlrpc-c-$(LIBXMLRPC_VERSION).tgz
 LIBXMLRPC_SITE = http://downloads.sourceforge.net/project/xmlrpc-c/Xmlrpc-c%20Super%20Stable/$(LIBXMLRPC_VERSION)
 LIBXMLRPC_LICENSE = BSD-3c (xml-rpc main code and abyss web server), BSD like (lib/expat), Python 1.5.2 license (parts of xmlrpc_base64.c)
Signature · 1 line
2.7.0
#5 lore raw

PATCH v2 1/1 Bump libxmlrpc to version 1.39.10

Hello,

The title of the commit is still not correct, it should be:

	libxmlrpc: bump to 1.39.10

But there are more issues, see below.

Quoted 6 lines · Alvaro G. M

Previous version patches are still needed, but they have been upgraded to apply cleanly.

Bumped version fixes compilation issue on some architectures (arm, microblaze).

Fixes:
http://autobuild.buildroot.net/results/c45530f34bf2074bd204c485615124df928f246c

This problem has already been fixed more than two month ago, by commit aa9fde1c459dbc20b268694eafd7a1d3341dbf76.

In addition, your patch does not work: you have created it on an old version of Buildroot, which predates commit aa9fde1c459dbc20b268694eafd7a1d3341dbf76. And therefore, the patch added in aa9fde1c459dbc20b268694eafd7a1d3341dbf76 no longer applies (and probably should be removed).

Unfortunately, even after doing this, it still doesn't build with the following error:

arm-buildroot-linux-gnueabihf-ar cru libxmlrpc_util.a asprintf.o base64.o error.o lock_platform.o lock_pthread.o lock_none.o make_printable.o memblock.o select.o sleep.o string_number.o time.o utf8.o /bin/bash: arm-buildroot-linux-gnueabihf-ar: command not found
/home/thomas/projets/buildroot/output/build/libxmlrpc-1.39.10/common.mk:112: recipe for target 'libxmlrpc_util.a' failed

Could you please rebase your patch on top of the current next branch, and test it with the following configuration:

BR2_arm=y
BR2_cortex_a9=y
BR2_ARM_ENABLE_VFP=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-a9-glibc-2016.08-613-ge98b4dd.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_8=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
BR2_TOOLCHAIN_EXTERNAL_CXX=y
BR2_INIT_NONE=y
BR2_SYSTEM_BIN_SH_NONE=y
# BR2_PACKAGE_BUSYBOX is not set
BR2_PACKAGE_LIBXMLRPC=y
# BR2_TARGET_ROOTFS_TAR is not set

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
author
#6 lore raw

PATCH v2 1/1 Bump libxmlrpc to version 1.39.10

Hi, Thomas

2016-11-11 15:38 GMT+01:00 Thomas Petazzoni <thomas.petazzoni@free-electro ns.com>:

Quoted 11 lines · Alvaro G. M
Quoted 1 line

Previous version patches are still needed, but they have been upgraded

to apply cleanly.

Quoted 2 lines

Bumped version fixes compilation issue on some architectures (arm,

microblaze).

Quoted 3 lines

Fixes:
http://autobuild.buildroot.net/results/c45530f34bf2074bd204c

485615124df928f246c

Quoted 9 lines

This problem has already been fixed more than two month ago, by commit aa9fde1c459dbc20b268694eafd7a1d3341dbf76.

In addition, your patch does not work: you have created it on an old version of Buildroot, which predates commit aa9fde1c459dbc20b268694eafd7a1d3341dbf76. And therefore, the patch added in aa9fde1c459dbc20b268694eafd7a1d3341dbf76 no longer applies (and probably should be removed).

Yes, you're right. I have the bad habit of patching things for myself and forget
for a while that I should send them, so when I get to it, they're already too old.
Sorry about that, I'll try my best next time.

Quoted 10 lines

Unfortunately, even after doing this, it still doesn't build with the following error:

arm-buildroot-linux-gnueabihf-ar cru libxmlrpc_util.a asprintf.o base64.o error.o lock_platform.o lock_pthread.o lock_none.o make_printable.o memblock.o select.o sleep.o string_number.o time.o utf8.o /bin/bash: arm-buildroot-linux-gnueabihf-ar: command not found /home/thomas/projets/buildroot/output/build/libxmlrpc-1.39.10/ common.mk:112: recipe for target 'libxmlrpc_util.a' failed

Ok, so that must be why in the first version of the patch I included the following:

-LIBXMLRPC_MAKE_OPTS = $(LIBXMLRPC_STATIC_OPTS) +LIBXMLRPC_MAKE_OPTS = $(LIBXMLRPC_STATIC_OPTS) AR="$(TARGET_AR)" RANLIB="$(TARGET_RANLIB)"

But since you questioned me about it and couldn't remember the cause and I got it to compile without any problem I removed it from v2. Yet another reason to send these patches sooner rather than later!

Could you please rebase your patch on top of the current next branch,

Quoted 11 lines

and test it with the following configuration:

BR2_arm=y
BR2_cortex_a9=y
BR2_ARM_ENABLE_VFP=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/t oolchains/tarballs/br-arm-cortex-a9-glibc-2016.08-613-ge98b4dd.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y

Quoted 10 lines

BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_8=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
BR2_TOOLCHAIN_EXTERNAL_CXX=y
BR2_INIT_NONE=y
BR2_SYSTEM_BIN_SH_NONE=y
# BR2_PACKAGE_BUSYBOX is not set
BR2_PACKAGE_LIBXMLRPC=y
# BR2_TARGET_ROOTFS_TAR is not set

If I don't add AR=$(TARGET_AR) to LIBXMLRPC_MAKE_OPTS, compilation fails as you've already shown. If I add patch above defining AR and
RANLIB, compiles succesfully, but installation to staging fails because of ranlib:

arm-buildroot-linux-gnueabihf-ranlib /tmp/buildroot/output/host/
usr/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/libxmlrpc_util.a /bin/sh: line 3: arm-buildroot-linux-gnueabihf-ranlib: command not found

I don't know how to solve this, though, my expectation was that adding RANLIB="$(TARGET_RANLIB)" to MAKE_OPTS would solve that :/

I'm sending v3 patch with these changes, though it still won't install...

Best regards

Signature · 4 lines
?lvaro G?mez Machado
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20161115/488ab373/attachment.html>
author
#7 lore raw

PATCH v3 1/1 libxmlrpc: bump to 1.39.11

Previous version patches are still needed, but they have been upgraded to apply cleanly.

This also reverts aa9fde1c459dbc20b268694eafd7a1d3341dbf76, as that patch is already on upstream.

Signed-off-by Alvaro Gamez <[email protected]>
---
 package/libxmlrpc/0001-fix-gennmtab-build.patch    |  2 +-
 .../libxmlrpc/0004-use-correct-curl-config.patch   | 36 +++-------------------
 package/libxmlrpc/0006-narrowing.patch             | 20 ------------
 package/libxmlrpc/libxmlrpc.hash                   |  2 +-
 package/libxmlrpc/libxmlrpc.mk                     |  4 +--
 5 files changed, 9 insertions(+), 55 deletions(-)
 delete mode 100644 package/libxmlrpc/0006-narrowing.patch
package/libxmlrpc/0001-fix-gennmtab-build.patch +1 -1
index 8cdd932..e98e5cb 100644
@@ -19,7 +19,7 @@ Index: b/lib/expat/gennmtab/Makefile
 +	$(CC_FOR_BUILD) -c $< -o $@ $(CFLAGS_FOR_BUILD) $(INCLUDES)
  
  gennmtab:%:%.o
--	$(BUILDTOOL_CCLD) -o $@ $(LDFLAGS) $^
+-	$(BUILDTOOL_CCLD) -o $@ $(LDFLAGS_ALL) $^
 +	$(CC_FOR_BUILD) -o $@ $(LDFLAGS_FOR_BUILD) $^
  
  include depend.mk
package/libxmlrpc/0004-use-correct-curl-config.patch +5 -31
index b581643..f2f1c55 100644
@@ -12,15 +12,15 @@ Index: b/src/Makefile
 ===================================================================
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -56,7 +56,7 @@
-   TRANSPORT_MODS += blddir/lib/curl_transport/curltransaction
-   TRANSPORT_MODS += blddir/lib/curl_transport/curlmulti
-   TRANSPORT_MODS += blddir/lib/curl_transport/lock_pthread
+@@ -57,7 +57,7 @@
+   TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/xmlrpc_curl_transport
+   TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/curltransaction
+   TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/curlmulti
 -  TRANSPORT_LIBDEP += $(shell curl-config --libs)
 +  TRANSPORT_LIBDEP += $(shell $CURL_CONFIG --libs)
+   TRANSPORT_INCLUDES += -Isrcdir/lib/curl_transport
  endif
  ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes)
-   TRANSPORT_MODS += blddir/lib/libwww_transport/xmlrpc_libwww_transport
 Index: b/config.mk.in
 ===================================================================
 --- a/config.mk.in

@@ -68,29 +68,3 @@ Index: b/lib/curl_transport/Makefile
  # We expect that curl-config --cflags just gives us -I options, because
  # we need just the -I options for 'make dep'.  Plus, it's scary to think
  # of what any other compiler flag would do to our compile.
-Index: b/src/cpp/test/Makefile
-===================================================================
---- a/src/cpp/test/Makefile
-+++ b/src/cpp/test/Makefile
-@@ -20,7 +20,7 @@
- LIBS := $(shell $(XMLRPC_C_CONFIG) client --ldadd)
- 
- ifeq ($(MUST_BUILD_CURL_CLIENT),yes)
--  LIBS += $(shell curl-config --libs)
-+  LIBS += $(shell $(CURL_CONFIG) --libs)
- endif
- ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes)
-   LIBS += $(shell libwww-config --libs)
-Index: b/tools/common.mk
-===================================================================
---- a/tools/common.mk
-+++ b/tools/common.mk
-@@ -15,7 +15,7 @@
-   CLIENT_LDLIBS += $(shell libwww-config --libs)
- endif
- ifeq ($(MUST_BUILD_CURL_CLIENT),yes)
--  CLIENT_LDLIBS += $(shell curl-config --libs)
-+  CLIENT_LDLIBS += $(shell $(CURL_CONFIG) --libs)
- endif
- ifeq ($(MUST_BUILD_WININET_CLIENT),yes)
-   CLIENT_LDLIBS += $(shell wininet-config --libs)
package/libxmlrpc/0006-narrowing.patch deleted +0 -20
deleted file mode 100644
index 43a5ca5..0000000
@@ -1,20 +0,0 @@
-Fix build with gcc6
-
-Downloaded from
-https://build.opensuse.org/package/view_file/devel:libraries:c_c++/xmlrpc-c/narrowing.patch
-
-Signed-off-by: Bernd Kuhls <[email protected]>
-
-Index: xmlrpc-c-1.33.18/src/cpp/base64.cpp
-===================================================================
---- xmlrpc-c-1.33.18.orig/src/cpp/base64.cpp
-+++ xmlrpc-c-1.33.18/src/cpp/base64.cpp
-@@ -14,7 +14,7 @@ using namespace xmlrpc_c;
- 
- namespace {
- 
--char const table_a2b_base64[] = {
-+signed char const table_a2b_base64[] = {
-     -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-     -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-     -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,-1,-1,63,
package/libxmlrpc/libxmlrpc.hash +1 -1
index d37fcfc..8ec1e14 100644
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 8ae6ed4ec57d50ed132b1150fc5258346eef3e291501a564f14fa97586902f98 xmlrpc-c-1.25.30.tgz
+sha256 2e56cdcdd5c5fa564bcdc7a56bca108a88f5b78b34ccc85558366efabdc8b8e8 xmlrpc-c-1.39.11.tgz
package/libxmlrpc/libxmlrpc.mk +2 -2
index 03a7095..caaeb12 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBXMLRPC_VERSION = 1.25.30
+LIBXMLRPC_VERSION = 1.39.11
 LIBXMLRPC_SOURCE = xmlrpc-c-$(LIBXMLRPC_VERSION).tgz
 LIBXMLRPC_SITE = http://downloads.sourceforge.net/project/xmlrpc-c/Xmlrpc-c%20Super%20Stable/$(LIBXMLRPC_VERSION)
 LIBXMLRPC_LICENSE = BSD-3c (xml-rpc main code and abyss web server), BSD like (lib/expat), Python 1.5.2 license (parts of xmlrpc_base64.c)

@@ -39,7 +39,7 @@ ifeq ($(BR2_STATIC_LIBS),y)
 LIBXMLRPC_STATIC_OPTS = SHARED_LIB_TYPE=NONE MUST_BUILD_SHLIB=N
 endif
 
-LIBXMLRPC_MAKE_OPTS = $(LIBXMLRPC_STATIC_OPTS)
+LIBXMLRPC_MAKE_OPTS = $(LIBXMLRPC_STATIC_OPTS) AR="$(TARGET_AR)" RANLIB="$(TARGET_RANLIB)"
 LIBXMLRPC_INSTALL_STAGING_OPTS = $(LIBXMLRPC_STATIC_OPTS) \
 	DESTDIR=$(STAGING_DIR) install
 LIBXMLRPC_INSTALL_TARGET_OPTS = $(LIBXMLRPC_STATIC_OPTS) \
Signature · 1 line
2.7.0
Applied
#8 lore raw

PATCH v3 1/1 libxmlrpc: bump to 1.39.11

Hello,

Quoted 7 lines · Alvaro G. M

Previous version patches are still needed, but they have been upgraded to apply cleanly.

This also reverts aa9fde1c459dbc20b268694eafd7a1d3341dbf76, as that patch is already on upstream.

Signed-off-by Alvaro Gamez <[email protected]>
Quoted 8 lines
---
 package/libxmlrpc/0001-fix-gennmtab-build.patch    |  2 +-
 .../libxmlrpc/0004-use-correct-curl-config.patch   | 36 +++-------------------
 package/libxmlrpc/0006-narrowing.patch             | 20 ------------
 package/libxmlrpc/libxmlrpc.hash                   |  2 +-
 package/libxmlrpc/libxmlrpc.mk                     |  4 +--
 5 files changed, 9 insertions(+), 55 deletions(-)
 delete mode 100644 package/libxmlrpc/0006-narrowing.patch

Applied to next, thanks. I've fixed the ar/ranlib issue by adding another patch (patch 0006).

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#9 lore raw

PATCH v3 1/1 libxmlrpc: bump to 1.39.11

2016-11-16 23:15 GMT+01:00 Thomas Petazzoni <
[email protected]>:

Quoted 5 lines

Applied to next, thanks. I've fixed the ar/ranlib issue by adding another patch (patch 0006).

Thanks!

Thanks a lot for your help, I wouldn't have ever known how to fix that by myself.

Best regards

Signature · 4 lines
?lvaro G?mez Machado
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20161117/24ae4030/attachment.html>
#10 lore raw

PATCH v3 1/1 libxmlrpc: bump to 1.39.11

In reply to Alvaro G. M

Hello,

Quoted 7 lines · Alvaro G. M

Previous version patches are still needed, but they have been upgraded to apply cleanly.

This also reverts aa9fde1c459dbc20b268694eafd7a1d3341dbf76, as that patch is already on upstream.

Signed-off-by Alvaro Gamez <[email protected]>
Quoted 8 lines
---
 package/libxmlrpc/0001-fix-gennmtab-build.patch    |  2 +-
 .../libxmlrpc/0004-use-correct-curl-config.patch   | 36 +++-------------------
 package/libxmlrpc/0006-narrowing.patch             | 20 ------------
 package/libxmlrpc/libxmlrpc.hash                   |  2 +-
 package/libxmlrpc/libxmlrpc.mk                     |  4 +--
 5 files changed, 9 insertions(+), 55 deletions(-)
 delete mode 100644 package/libxmlrpc/0006-narrowing.patch

This update is causing a bunch of build failures:

http://autobuild.buildroot.net/?reason=libxmlrpc-1.39.11

All of them look like this:

make[3]: Entering directory `/accts/mlweber1/rc-buildroot-test/scripts/instance-1/output/build/libxmlrpc-1.39.11/lib/libutil++' /accts/mlweber1/rc-buildroot-test/scripts/instance-1/output/build/libxmlrpc-1.39.11/lib/libutil++/Makefile:109: depend.mk: No such file or directory cat /dev/null >depend.mk
ln -s /accts/mlweber1/rc-buildroot-test/scripts/instance-1/output/build/libxmlrpc-1.39.11 srcdir
ln -s /accts/mlweber1/rc-buildroot-test/scripts/instance-1/output/build/libxmlrpc-1.39.11 blddir
make[3]: Leaving directory `/accts/mlweber1/rc-buildroot-test/scripts/instance-1/output/build/libxmlrpc-1.39.11/lib/libutil++'

Could you have a look and provide a patch to fix this?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
author
#11 lore raw

PATCH v3 1/1 libxmlrpc: bump to 1.39.11

Quoted 10 lines · Thomas Petazzoni

All of them look like this:

make[3]: Entering directory `/accts/mlweber1/rc-buildroot-test/scripts/instance-1/output/build/libxmlrpc-1.39.11/lib/libutil++' /accts/mlweber1/rc-buildroot-test/scripts/instance-1/output/build/libxmlrpc-1.39.11/lib/libutil++/Makefile:109: depend.mk: No such file or directory cat /dev/null >depend.mk
ln -s /accts/mlweber1/rc-buildroot-test/scripts/instance-1/output/build/libxmlrpc-1.39.11 srcdir
ln -s /accts/mlweber1/rc-buildroot-test/scripts/instance-1/output/build/libxmlrpc-1.39.11 blddir
make[3]: Leaving directory `/accts/mlweber1/rc-buildroot-test/scripts/instance-1/output/build/libxmlrpc-1.39.11/lib/libutil++'

Could you have a look and provide a patch to fix this?

Hi, Thomas

I already know the cause for this and the patch is simple. However, before sending the proposed patch as a git am commitable email, I'd like to query about which shall be the best way to provide it.

The issue is that this version of libxmlrpc includes new subdir libutils++, which requires c++ but without which the library can perform its function perfectly. The way to solve this then is to patch lib/Makefile as inlined below, making this directory compilable only if there's c++ support.

The question is: given that there is already a patch in buildroot called 0002-fix-non-cplusplus-build.patch which does exactly the same on a different file (lib/util/Makefile), should I modify this patch to include both changes, as the name and description of the patch is basically the same, or should I provide another .patch file for this to include under package/libxmlrpc?

These are the contents of proposed patch:

tmp/Makefile renamed from Makefile +4 -1
@@ -9,7 +9,10 @@
 
 # Build up SUBDIRS:
 SUBDIRS = 
-SUBDIRS += util libutil libutil++
+SUBDIRS += util libutil
+ifeq ($(ENABLE_CPLUSPLUS),yes)
+  SUBDIRS += libutil++
+endif
 ifeq ($(ENABLE_ABYSS_SERVER),yes)
   SUBDIRS += abyss
   ifeq ($(ENABLE_CPLUSPLUS),yes)

Thank you!

Signature · 1 line
Alvaro G. M.
#12 lore raw

PATCH v3 1/1 libxmlrpc: bump to 1.39.11

Hello,

Quoted 3 lines · Alvaro G. M.

I already know the cause for this and the patch is simple. However, before sending the proposed patch as a git am commitable email, I'd like to query about which shall be the best way to provide it.

Sure. Thanks a lot for having already investigated the problem.

Quoted 11 lines

The issue is that this version of libxmlrpc includes new subdir libutils++, which requires c++ but without which the library can perform its function perfectly. The way to solve this then is to patch lib/Makefile as inlined below, making this directory compilable only if there's c++ support.

The question is: given that there is already a patch in buildroot called 0002-fix-non-cplusplus-build.patch which does exactly the same on a different file (lib/util/Makefile), should I modify this patch to include both changes, as the name and description of the patch is basically the same, or should I provide another .patch file for this to include under package/libxmlrpc?

Modifying the existing 0002-fix-non-cplusplus-build.patch is indeed the right thing to do here.

Also, since you're interested in libxmlrpc, could you send the different patches we have for this package to the upstream developers?

Thanks a lot!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
author
#13 lore raw

PATCH 1/1 libxmlrpc: fix build without C++ compiler

From: Alvaro Gamez Machado <[email protected]>

Conditionally deactivate compilation of optional C++ module.

Fixes:
http://autobuild.buildroot.net/results/cbf/cbff6c816606a515467d467677763533a41fc276/

Signed-off-by Alvaro Gamez Machado <[email protected]>
---
 package/libxmlrpc/0002-fix-non-cplusplus-build.patch | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)
package/libxmlrpc/0002-fix-non-cplusplus-build.patch +18 -1
index efeb9cc..2d5bfcc 100644
@@ -1,9 +1,10 @@
 Handle builds without C++
 
 libxmlrpc nicely handles the fact of being built without C++ support,
-except for one location, fixed by this patch.
+except for two locations, fixed by this patch.
 
 Signed-off-by: Thomas Petazzoni <[email protected]>
+Signed-off-by: Alvaro Gamez Machado <[email protected]>
 
 Index: b/lib/util/Makefile
 ===================================================================

@@ -25,3 +26,19 @@ Index: b/lib/util/Makefile
  .PHONY: all
  all: $(LIBOBJS)
  
+Index: b/lib/Makefile
+===================================================================
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -9,7 +9,10 @@
+ 
+ # Build up SUBDIRS:
+ SUBDIRS = 
+-SUBDIRS += util libutil libutil++
++SUBDIRS += util libutil
++ifeq ($(ENABLE_CPLUSPLUS),yes)
++  SUBDIRS += libutil++
++endif
+ ifeq ($(ENABLE_ABYSS_SERVER),yes)
+   SUBDIRS += abyss
+   ifeq ($(ENABLE_CPLUSPLUS),yes)
Signature · 1 line
2.7.0
Applied
#14 lore raw

PATCH 1/1 libxmlrpc: fix build without C++ compiler

Hello,

Quoted 10 lines · Alvaro G. M

From: Alvaro Gamez Machado <[email protected]>

Conditionally deactivate compilation of optional C++ module.

Fixes:
http://autobuild.buildroot.net/results/cbf/cbff6c816606a515467d467677763533a41fc276/

Signed-off-by Alvaro Gamez Machado <[email protected]>
---
 package/libxmlrpc/0002-fix-non-cplusplus-build.patch | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

Applied to master, thanks.

BTW, you shouldn't send such new patches as a reply to the older ones. Just send normally, with no "In-Reply-To" reference.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#15 lore raw

PATCH v3 1/1 libxmlrpc: bump to 1.39.11

In reply to Thomas Petazzoni
Quoted 5 lines · Thomas Petazzoni

Modifying the existing 0002-fix-non-cplusplus-build.patch is indeed the right thing to do here.

Also, since you're interested in libxmlrpc, could you send the different patches we have for this package to the upstream developers?

Sure, I've just done both things: I've sent a patch with this fix to the mail list and I've just sent an email to the author to see if he's willing to include the set of patches we have right now. I know he's a bit reticent to modify superstable release of xmlrpc, but I hope these patches are small enough to make him happy.

Best regards!

Signature · 1 line
Alvaro G. M.