| Message ID | 1479207044-12290-1-git-send-email-alvaro.gamez@hazent.com |
|---|---|
| State | Accepted |
| Headers | show |
Hello, On Tue, 15 Nov 2016 11:50:44 +0100, Alvaro G. M wrote: > 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 <alvaro.gamez@hazent.com> > --- > 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
2016-11-16 23:15 GMT+01:00 Thomas Petazzoni < thomas.petazzoni@free-electrons.com>: > 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
Hello, On Tue, 15 Nov 2016 11:50:44 +0100, Alvaro G. M wrote: > 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 <alvaro.gamez@hazent.com> > --- > 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
Hello, On Sun, 4 Dec 2016 16:33:28 +0100, Alvaro G. M. wrote: > 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. > 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
On Sun, Dec 04, 2016 at 04:37:45PM +0100, Thomas Petazzoni wrote: > 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!
diff --git a/package/libxmlrpc/0001-fix-gennmtab-build.patch b/package/libxmlrpc/0001-fix-gennmtab-build.patch index 8cdd932..e98e5cb 100644 --- a/package/libxmlrpc/0001-fix-gennmtab-build.patch +++ b/package/libxmlrpc/0001-fix-gennmtab-build.patch @@ -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 diff --git a/package/libxmlrpc/0004-use-correct-curl-config.patch b/package/libxmlrpc/0004-use-correct-curl-config.patch index b581643..f2f1c55 100644 --- a/package/libxmlrpc/0004-use-correct-curl-config.patch +++ b/package/libxmlrpc/0004-use-correct-curl-config.patch @@ -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) diff --git a/package/libxmlrpc/0006-narrowing.patch b/package/libxmlrpc/0006-narrowing.patch deleted file mode 100644 index 43a5ca5..0000000 --- a/package/libxmlrpc/0006-narrowing.patch +++ /dev/null @@ -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 <bernd.kuhls@t-online.de> - -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, diff --git a/package/libxmlrpc/libxmlrpc.hash b/package/libxmlrpc/libxmlrpc.hash index d37fcfc..8ec1e14 100644 --- a/package/libxmlrpc/libxmlrpc.hash +++ b/package/libxmlrpc/libxmlrpc.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 8ae6ed4ec57d50ed132b1150fc5258346eef3e291501a564f14fa97586902f98 xmlrpc-c-1.25.30.tgz +sha256 2e56cdcdd5c5fa564bcdc7a56bca108a88f5b78b34ccc85558366efabdc8b8e8 xmlrpc-c-1.39.11.tgz diff --git a/package/libxmlrpc/libxmlrpc.mk b/package/libxmlrpc/libxmlrpc.mk index 03a7095..caaeb12 100644 --- a/package/libxmlrpc/libxmlrpc.mk +++ b/package/libxmlrpc/libxmlrpc.mk @@ -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) \
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 <alvaro.gamez@hazent.com> --- 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