diff mbox

libxmlrpc: new package

Message ID 1381311986-11533-1-git-send-email-alvaro.gamez@hazent.com
State Superseded
Headers show

Commit Message

Alvaro Gamez Machado Oct. 9, 2013, 9:46 a.m. UTC 
From: Alvaro G. M. <alvaro.gamez@hazent.com>

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Alvaro G. M <alvaro.gamez@hazent.com>
---

I recovered an old patch from Thomas (http://lists.busybox.net/pipermail/buildroot/2012-June/054467.html)
and upgraded it to the stable version of xml-rpc-c.
Some of the original patches are not needed on this version, so I've mostly just deleted
a patch files, upgraded download address and version and modified patch offsets so they apply
without any warning.

 package/Config.in                                  |  1 +
 package/libxmlrpc/Config.in                        | 10 +++++++
 .../libxmlrpc/libxmlrpc-fix-gennmtab-build.patch   | 25 ++++++++++++++++
 .../libxmlrpc-fix-non-cplusplus-build.patch        | 27 +++++++++++++++++
 .../libxmlrpc/libxmlrpc-fix-non-wchar-build.patch  | 24 +++++++++++++++
 .../libxmlrpc-use-correct-curl-config.patch        | 22 ++++++++++++++
 package/libxmlrpc/libxmlrpc.mk                     | 34 ++++++++++++++++++++++
 7 files changed, 143 insertions(+)
 create mode 100644 package/libxmlrpc/Config.in
 create mode 100644 package/libxmlrpc/libxmlrpc-fix-gennmtab-build.patch
 create mode 100644 package/libxmlrpc/libxmlrpc-fix-non-cplusplus-build.patch
 create mode 100644 package/libxmlrpc/libxmlrpc-fix-non-wchar-build.patch
 create mode 100644 package/libxmlrpc/libxmlrpc-use-correct-curl-config.patch
 create mode 100644 package/libxmlrpc/libxmlrpc.mk

Comments

Thomas Petazzoni Oct. 9, 2013, 11:43 a.m. UTC | #1 
Dear Alvaro G. M,

On Wed,  9 Oct 2013 11:46:26 +0200, Alvaro G. M wrote:
> From: Alvaro G. M. <alvaro.gamez@hazent.com>
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Signed-off-by: Alvaro G. M <alvaro.gamez@hazent.com>
> ---
> 
> I recovered an old patch from Thomas (http://lists.busybox.net/pipermail/buildroot/2012-June/054467.html)
> and upgraded it to the stable version of xml-rpc-c.
> Some of the original patches are not needed on this version, so I've mostly just deleted
> a patch files, upgraded download address and version and modified patch offsets so they apply
> without any warning.
> 
>  package/Config.in                                  |  1 +
>  package/libxmlrpc/Config.in                        | 10 +++++++
>  .../libxmlrpc/libxmlrpc-fix-gennmtab-build.patch   | 25 ++++++++++++++++
>  .../libxmlrpc-fix-non-cplusplus-build.patch        | 27 +++++++++++++++++
>  .../libxmlrpc/libxmlrpc-fix-non-wchar-build.patch  | 24 +++++++++++++++
>  .../libxmlrpc-use-correct-curl-config.patch        | 22 ++++++++++++++

It would be good to use a number in the patch file names, such as:

	libxmlrpc-01-<something>.patch
	libxmlrpc-02-<somethingelse>.patch

> new file mode 100644
> index 0000000..ef41041
> --- /dev/null
> +++ b/package/libxmlrpc/libxmlrpc.mk
> @@ -0,0 +1,34 @@
> +#############################################################

Those lines should have 80 #

> +#
> +# libxmlrpc
> +#
> +#############################################################

One empty line between the header and the first variable.

> +LIBXMLRPC_VERSION = 1.25.26
> +LIBXMLRPC_SOURCE = xmlrpc-c-$(LIBXMLRPC_VERSION).tgz
> +LIBXMLRPC_SITE = "http://downloads.sourceforge.net/project/xmlrpc-c/Xmlrpc-c%20Super%20Stable/1.25.26"
> +LIBXMLRPC_INSTALL_STAGING = YES
> +LIBXMLRPC_DEPENDENCIES = libcurl

Can you add LIBXMLRPC_LICENSE and LIBXMLRPC_LICENSE_FILES ?

> +LIBXMLRPC_CONF_OPT = \
> +	$(if $(BR2_USE_WCHAR),,ac_cv_header_wchar_h=no) \
> +	$(if $(BR2_INSTALL_LIBSTDCPP),,--disable-cplusplus) \
> +	have_curl_config=$(STAGING_DIR)/usr/bin/curl-config \
> +	CURL_CONFIG=$(STAGING_DIR)/usr/bin/curl-config
> +
> +# Our package uses autoconf, but not automake, so we need to pass
> +# those variables at compile time as well.
> +LIBXMLRPC_MAKE_ENV = \
> +	CC_FOR_BUILD="$(HOSTCC)" \
> +	LD_FOR_BUILD="$(HOSTLD)" \
> +	CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
> +	LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)"
> +
> +define LIBXMLRPC_REMOVE_DEVFILE
> +	$(RM) $(TARGET_DIR)/usr/bin/xmlrpc-c-config
> +endef

Hum, maybe this should use the <pkg>_CONFIG_SCRIPTS mechanism instead
(if xmlrpc-c-config is a shell script).

> +
> +ifeq ($(BR2_HAVE_DEVFILES),)
> +LIBXMLRPC_POST_INSTALL_TARGET_HOOKS += LIBXMLRPC_REMOVE_DEVFILE
> +endif
> +
> +$(eval $(autotools-package))

Thanks,

Thomas
Alvaro Gamez Machado Oct. 9, 2013, 12:08 p.m. UTC | #2 
Hi!


2013/10/9 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

> It would be good to use a number in the patch file names, such as:
>
>         libxmlrpc-01-<something>.patch
>         libxmlrpc-02-<somethingelse>.patch
>

In this case, the order doesn't matter, but will do anyway

> +#############################################################

Those lines should have 80 #
>

Done.


> One empty line between the header and the first variable.
>

And done.


> Can you add LIBXMLRPC_LICENSE and LIBXMLRPC_LICENSE_FILES ?
>

Done, although it's not perfect, there are three different licenses, two of
them bsd like... it's a bit confusing.


>   > +define LIBXMLRPC_REMOVE_DEVFILE
> > +     $(RM) $(TARGET_DIR)/usr/bin/xmlrpc-c-config
> > +endef
>
> Hum, maybe this should use the <pkg>_CONFIG_SCRIPTS mechanism instead
> (if xmlrpc-c-config is a shell script).
>

Yes, it is much cleaner now.

I'm sending the new patch right now
diff mbox

Patch

diff --git a/package/Config.in b/package/Config.in
index 9aa9d81..3c44f67 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -727,6 +727,7 @@  source "package/libjson/Config.in"
 source "package/libroxml/Config.in"
 source "package/libxml-parser-perl/Config.in"
 source "package/libxml2/Config.in"
+source "package/libxmlrpc/Config.in"
 source "package/libxmlpp/Config.in"
 source "package/libxslt/Config.in"
 source "package/libyaml/Config.in"
diff --git a/package/libxmlrpc/Config.in b/package/libxmlrpc/Config.in
new file mode 100644
index 0000000..26e4a52
--- /dev/null
+++ b/package/libxmlrpc/Config.in
@@ -0,0 +1,10 @@ 
+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/
diff --git a/package/libxmlrpc/libxmlrpc-fix-gennmtab-build.patch b/package/libxmlrpc/libxmlrpc-fix-gennmtab-build.patch
new file mode 100644
index 0000000..8cdd932
--- /dev/null
+++ b/package/libxmlrpc/libxmlrpc-fix-gennmtab-build.patch
@@ -0,0 +1,25 @@ 
+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
diff --git a/package/libxmlrpc/libxmlrpc-fix-non-cplusplus-build.patch b/package/libxmlrpc/libxmlrpc-fix-non-cplusplus-build.patch
new file mode 100644
index 0000000..efeb9cc
--- /dev/null
+++ b/package/libxmlrpc/libxmlrpc-fix-non-cplusplus-build.patch
@@ -0,0 +1,27 @@ 
+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)
+ 
diff --git a/package/libxmlrpc/libxmlrpc-fix-non-wchar-build.patch b/package/libxmlrpc/libxmlrpc-fix-non-wchar-build.patch
new file mode 100644
index 0000000..1f04353
--- /dev/null
+++ b/package/libxmlrpc/libxmlrpc-fix-non-wchar-build.patch
@@ -0,0 +1,24 @@ 
+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);
diff --git a/package/libxmlrpc/libxmlrpc-use-correct-curl-config.patch b/package/libxmlrpc/libxmlrpc-use-correct-curl-config.patch
new file mode 100644
index 0000000..ada0bd2
--- /dev/null
+++ b/package/libxmlrpc/libxmlrpc-use-correct-curl-config.patch
@@ -0,0 +1,22 @@ 
+Use correct curl-config program
+
+Instead of calling again curl-config in src/Makefile (which ends up
+calling the wrong curl-config: the one in the PATH instead of the one
+pointed at by the environment variables at configure time), let's use
+the CURL_LDADD variable which was computed at configure time.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+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
+-  TRANSPORT_LIBDEP += $(shell curl-config --libs)
++  TRANSPORT_LIBDEP += $(CURL_LDADD)
+ endif
+ ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes)
+   TRANSPORT_MODS += blddir/lib/libwww_transport/xmlrpc_libwww_transport
diff --git a/package/libxmlrpc/libxmlrpc.mk b/package/libxmlrpc/libxmlrpc.mk
new file mode 100644
index 0000000..ef41041
--- /dev/null
+++ b/package/libxmlrpc/libxmlrpc.mk
@@ -0,0 +1,34 @@ 
+#############################################################
+#
+# libxmlrpc
+#
+#############################################################
+LIBXMLRPC_VERSION = 1.25.26
+LIBXMLRPC_SOURCE = xmlrpc-c-$(LIBXMLRPC_VERSION).tgz
+LIBXMLRPC_SITE = "http://downloads.sourceforge.net/project/xmlrpc-c/Xmlrpc-c%20Super%20Stable/1.25.26"
+LIBXMLRPC_INSTALL_STAGING = YES
+LIBXMLRPC_DEPENDENCIES = libcurl
+
+LIBXMLRPC_CONF_OPT = \
+	$(if $(BR2_USE_WCHAR),,ac_cv_header_wchar_h=no) \
+	$(if $(BR2_INSTALL_LIBSTDCPP),,--disable-cplusplus) \
+	have_curl_config=$(STAGING_DIR)/usr/bin/curl-config \
+	CURL_CONFIG=$(STAGING_DIR)/usr/bin/curl-config
+
+# Our package uses autoconf, but not automake, so we need to pass
+# those variables at compile time as well.
+LIBXMLRPC_MAKE_ENV = \
+	CC_FOR_BUILD="$(HOSTCC)" \
+	LD_FOR_BUILD="$(HOSTLD)" \
+	CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
+	LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)"
+
+define LIBXMLRPC_REMOVE_DEVFILE
+	$(RM) $(TARGET_DIR)/usr/bin/xmlrpc-c-config
+endef
+
+ifeq ($(BR2_HAVE_DEVFILES),)
+LIBXMLRPC_POST_INSTALL_TARGET_HOOKS += LIBXMLRPC_REMOVE_DEVFILE
+endif
+
+$(eval $(autotools-package))