Commit 92777aa2 authored by Alvaro G. M's avatar Alvaro G. M Committed by Thomas Petazzoni
Browse files
parent 477c28cf
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -655,6 +655,7 @@ source "package/libjson/Config.in"
source "package/libroxml/Config.in"
source "package/libxml2/Config.in"
source "package/libxmlpp/Config.in"
source "package/libxmlrpc/Config.in"
source "package/libxslt/Config.in"
source "package/libyaml/Config.in"
source "package/mxml/Config.in"
+10 −0
Original line number Diff line number Diff line
config BR2_PACKAGE_LIBXMLRPC
	bool "libxmlrpc"
	select BR2_PACKAGE_LIBCURL
	help
	  XML-RPC is a quick-and-easy way to make procedure calls over
	  the Internet. It converts the procedure call into an XML
	  document, sends it to a remote server using HTTP, and gets
	  back the response as XML.

	  http://xmlrpc-c.sourceforge.net/
+25 −0
Original line number Diff line number Diff line
Fix build of host tool

genmtab is a tool that needs to be built for the host as it is used
during the compilation process of libxmlrpc. Its Makefile needs a bit
of tuning to use the conventional CC_FOR_BUILD, CFLAGS_FOR_BUILD and
LDFLAGS_FOR_BUILD variables.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Index: b/lib/expat/gennmtab/Makefile
===================================================================
--- a/lib/expat/gennmtab/Makefile
+++ b/lib/expat/gennmtab/Makefile
@@ -40,9 +40,9 @@
 dep: dep-common
 
 gennmtab.o:%.o:%.c
-	$(BUILDTOOL_CC) -c $< -o $@ $(CFLAGS_ALL) $(INCLUDES)
+	$(CC_FOR_BUILD) -c $< -o $@ $(CFLAGS_FOR_BUILD) $(INCLUDES)
 
 gennmtab:%:%.o
-	$(BUILDTOOL_CCLD) -o $@ $(LDFLAGS) $^
+	$(CC_FOR_BUILD) -o $@ $(LDFLAGS_FOR_BUILD) $^
 
 include depend.mk
+27 −0
Original line number Diff line number Diff line
Handle builds without C++

libxmlrpc nicely handles the fact of being built without C++ support,
except for one location, fixed by this patch.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Index: b/lib/util/Makefile
===================================================================
--- a/lib/util/Makefile
+++ b/lib/util/Makefile
@@ -41,11 +41,14 @@
 LIBOBJS = \
   casprintf.o \
   cmdline_parser.o \
-  cmdline_parser_cpp.o \
   getoptx.o \
   string_parser.o \
   stripcaseeq.o \
 
+ifeq ($(ENABLE_CPLUSPLUS),yes)
+LIBOBJS += cmdline_parser_cpp.o
+endif
+
 .PHONY: all
 all: $(LIBOBJS)
 
+24 −0
Original line number Diff line number Diff line
Disable wide-char specific code

The vast majority of the libxmlrpc code nicely handles the absence of
wide char support, except at one location, which is fixed by this
patch.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Index: b/src/xmlrpc_decompose.c
===================================================================
--- a/src/xmlrpc_decompose.c
+++ b/src/xmlrpc_decompose.c
@@ -217,7 +217,11 @@
         xmlrpc_strfree(*decompRootP->store.Tstring.valueP);
         break;
     case 'w':
+#if HAVE_UNICODE_WCHAR
         free((void*)*decompRootP->store.TwideString.valueP);
+#else
+	XMLRPC_ASSERT(false);
+#endif
         break;
     case '6':
         free((void*)*decompRootP->store.TbitString.valueP);
Loading