* [Buildroot] [PATCH 01/10] monit: new package
2012-06-02 16:13 [Buildroot] [pull request] Pull request for branch for-2012.08/new-packages Thomas Petazzoni
@ 2012-06-02 16:13 ` Thomas Petazzoni
2012-06-11 20:31 ` Peter Korsgaard
2012-06-02 16:13 ` [Buildroot] [PATCH 02/10] libcurl: fix up prefix in curl-config Thomas Petazzoni
` (8 subsequent siblings)
9 siblings, 1 reply; 39+ messages in thread
From: Thomas Petazzoni @ 2012-06-02 16:13 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Config.in | 3 +++
package/monit/Config.in | 10 ++++++++++
package/monit/monit.mk | 30 ++++++++++++++++++++++++++++++
3 files changed, 43 insertions(+)
create mode 100644 package/monit/Config.in
create mode 100644 package/monit/monit.mk
diff --git a/package/Config.in b/package/Config.in
index ca8fc96..61f3fec 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -644,6 +644,9 @@ source "package/htop/Config.in"
source "package/kmod/Config.in"
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/module-init-tools/Config.in"
+endif
+source "package/monit/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/procps/Config.in"
source "package/psmisc/Config.in"
source "package/rsyslog/Config.in"
diff --git a/package/monit/Config.in b/package/monit/Config.in
new file mode 100644
index 0000000..6933aaf
--- /dev/null
+++ b/package/monit/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_MONIT
+ bool "monit"
+ help
+ Monit is a free open source utility for managing and
+ monitoring, processes, programs, files, directories and
+ filesystems on a UNIX system. Monit conducts automatic
+ maintenance and repair and can execute meaningful causal
+ actions in error situations.
+
+ http://mmonit.com/monit/
diff --git a/package/monit/monit.mk b/package/monit/monit.mk
new file mode 100644
index 0000000..958618d
--- /dev/null
+++ b/package/monit/monit.mk
@@ -0,0 +1,30 @@
+#############################################################
+#
+# monit
+#
+#############################################################
+
+MONIT_VERSION = 5.4
+MONIT_SITE = http://mmonit.com/monit/dist/
+
+MONIT_CONF_ENV = \
+ libmonit_cv_setjmp_available=yes \
+ libmonit_cv_vsnprintf_c99_conformant=yes
+
+MONIT_CONF_OPT += \
+ --without-pam
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+MONIT_CONF_OPT += --with-ssl
+MONIT_DEPENDENCIES += openssl
+else
+MONIT_CONF_OPT += --without-ssl
+endif
+
+ifeq ($(BR2_LARGEFILE),y)
+MONIT_CONF_OPT += --with-largefiles
+else
+MONIT_CONF_OPT += --without-largefiles
+endif
+
+$(eval $(call AUTOTARGETS))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 39+ messages in thread* [Buildroot] [PATCH 02/10] libcurl: fix up prefix in curl-config
2012-06-02 16:13 [Buildroot] [pull request] Pull request for branch for-2012.08/new-packages Thomas Petazzoni
2012-06-02 16:13 ` [Buildroot] [PATCH 01/10] monit: new package Thomas Petazzoni
@ 2012-06-02 16:13 ` Thomas Petazzoni
2012-06-11 20:36 ` Peter Korsgaard
2012-06-02 16:13 ` [Buildroot] [PATCH 03/10] libxmlrpc: new package Thomas Petazzoni
` (7 subsequent siblings)
9 siblings, 1 reply; 39+ messages in thread
From: Thomas Petazzoni @ 2012-06-02 16:13 UTC (permalink / raw)
To: buildroot
While most packages that rely on libcurl use pkg-config, a few
packages (such as libxmlrpc) still use curl-config. So we need to fix
up the prefix locations in the curl-config script installed in
STAGING_DIR.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/libcurl/libcurl.mk | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index e8f13bb..e43ff0f 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -30,6 +30,12 @@ endef
LIBCURL_POST_INSTALL_TARGET_HOOKS += LIBCURL_TARGET_CLEANUP
+define LIBCURL_STAGING_FIXUP_CURL_CONFIG
+ $(SED) "s,prefix=,prefix=$(STAGING_DIR)," $(STAGING_DIR)/usr/bin/curl-config
+endef
+
+LIBCURL_POST_INSTALL_STAGING_HOOKS += LIBCURL_STAGING_FIXUP_CURL_CONFIG
+
$(eval $(call AUTOTARGETS))
curl: libcurl
--
1.7.9.5
^ permalink raw reply related [flat|nested] 39+ messages in thread* [Buildroot] [PATCH 02/10] libcurl: fix up prefix in curl-config
2012-06-02 16:13 ` [Buildroot] [PATCH 02/10] libcurl: fix up prefix in curl-config Thomas Petazzoni
@ 2012-06-11 20:36 ` Peter Korsgaard
0 siblings, 0 replies; 39+ messages in thread
From: Peter Korsgaard @ 2012-06-11 20:36 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> While most packages that rely on libcurl use pkg-config, a few
Thomas> packages (such as libxmlrpc) still use curl-config. So we need to fix
Thomas> up the prefix locations in the curl-config script installed in
Thomas> STAGING_DIR.
Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas> ---
Thomas> package/libcurl/libcurl.mk | 6 ++++++
Thomas> 1 file changed, 6 insertions(+)
Thomas> diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
Thomas> index e8f13bb..e43ff0f 100644
Thomas> --- a/package/libcurl/libcurl.mk
Thomas> +++ b/package/libcurl/libcurl.mk
Thomas> @@ -30,6 +30,12 @@ endef
Thomas> LIBCURL_POST_INSTALL_TARGET_HOOKS += LIBCURL_TARGET_CLEANUP
Thomas> +define LIBCURL_STAGING_FIXUP_CURL_CONFIG
Thomas> + $(SED) "s,prefix=,prefix=$(STAGING_DIR)," $(STAGING_DIR)/usr/bin/curl-config
For the other -config scripts we only replace if we match prefix=/usr to
ensure things don't get screwed up if this step is ever ran more than
once, so I fixed that - Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH 03/10] libxmlrpc: new package
2012-06-02 16:13 [Buildroot] [pull request] Pull request for branch for-2012.08/new-packages Thomas Petazzoni
2012-06-02 16:13 ` [Buildroot] [PATCH 01/10] monit: new package Thomas Petazzoni
2012-06-02 16:13 ` [Buildroot] [PATCH 02/10] libcurl: fix up prefix in curl-config Thomas Petazzoni
@ 2012-06-02 16:13 ` Thomas Petazzoni
2012-06-04 23:58 ` Arnout Vandecappelle
[not found] ` <4FCD4B6D.3080506@mind.be>
2012-06-02 16:13 ` [Buildroot] [PATCH 04/10] llrp-toolkit: " Thomas Petazzoni
` (6 subsequent siblings)
9 siblings, 2 replies; 39+ messages in thread
From: Thomas Petazzoni @ 2012-06-02 16:13 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
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-remove-curl-types-h-include.patch | 43 +++++++++++++++++++
.../libxmlrpc-use-correct-curl-config.patch | 22 ++++++++++
package/libxmlrpc/libxmlrpc.mk | 44 ++++++++++++++++++++
8 files changed, 196 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-remove-curl-types-h-include.patch
create mode 100644 package/libxmlrpc/libxmlrpc-use-correct-curl-config.patch
create mode 100644 package/libxmlrpc/libxmlrpc.mk
diff --git a/package/Config.in b/package/Config.in
index 61f3fec..044b59b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -468,6 +468,7 @@ source "package/json-c/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/libxslt/Config.in"
source "package/libyaml/Config.in"
source "package/mxml/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..ed47ff7
--- /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
+@@ -36,11 +36,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..7df1fc8
--- /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
+@@ -221,7 +221,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-remove-curl-types-h-include.patch b/package/libxmlrpc/libxmlrpc-remove-curl-types-h-include.patch
new file mode 100644
index 0000000..3688bd3
--- /dev/null
+++ b/package/libxmlrpc/libxmlrpc-remove-curl-types-h-include.patch
@@ -0,0 +1,43 @@
+Do not include <curl/types.h>
+
+In recent versions of Curl, <curl/types.h> no longer exists, and
+<curl/curl.h> should be used instead.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/lib/curl_transport/curlmulti.c
+===================================================================
+--- a/lib/curl_transport/curlmulti.c
++++ b/lib/curl_transport/curlmulti.c
+@@ -19,7 +19,6 @@
+ #endif
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #include <curl/multi.h>
+
+Index: b/lib/curl_transport/curltransaction.c
+===================================================================
+--- a/lib/curl_transport/curltransaction.c
++++ b/lib/curl_transport/curltransaction.c
+@@ -17,7 +17,6 @@
+ #include "version.h"
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+
+ #include "curlversion.h"
+Index: b/lib/curl_transport/xmlrpc_curl_transport.c
+===================================================================
+--- a/lib/curl_transport/xmlrpc_curl_transport.c
++++ b/lib/curl_transport/xmlrpc_curl_transport.c
+@@ -85,7 +85,6 @@
+ #include "xmlrpc-c/time_int.h"
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #include <curl/multi.h>
+
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..55b72a1
--- /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..8c9fe49
--- /dev/null
+++ b/package/libxmlrpc/libxmlrpc.mk
@@ -0,0 +1,44 @@
+#############################################################
+#
+# libxmlrpc
+#
+#############################################################
+LIBXMLRPC_VERSION = 1.18.05
+LIBXMLRPC_SOURCE = xmlrpc-c-$(LIBXMLRPC_VERSION).tgz
+LIBXMLRPC_SITE = "http://xmlrpc-c.svn.sourceforge.net/viewvc/xmlrpc-c/advanced/?view=tar&pathrev=1716"
+LIBXMLRPC_INSTALL_STAGING = YES
+LIBXMLRPC_DEPENDENCIES = libcurl
+LIBXMLRPC_MAKE = $(MAKE1)
+
+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 $(call AUTOTARGETS))
+
+# Override the download step since we don't have the normal
+# site/source split (where site is the URL of the directory and source
+# is the name of the tarball file).
+$(LIBXMLRPC_DIR)/.stamp_downloaded:
+ $(Q)$(call MESSAGE,"Downloading")
+ $(call DOWNLOAD,$(LIBXMLRPC_SITE),$(LIBXMLRPC_SOURCE))
+ $(Q)mkdir -p $(@D)
+ $(Q)touch $@
--
1.7.9.5
^ permalink raw reply related [flat|nested] 39+ messages in thread* [Buildroot] [PATCH 03/10] libxmlrpc: new package
2012-06-02 16:13 ` [Buildroot] [PATCH 03/10] libxmlrpc: new package Thomas Petazzoni
@ 2012-06-04 23:58 ` Arnout Vandecappelle
2013-10-09 9:46 ` [Buildroot] [PATCH] " Alvaro G. M
[not found] ` <4FCD4B6D.3080506@mind.be>
1 sibling, 1 reply; 39+ messages in thread
From: Arnout Vandecappelle @ 2012-06-04 23:58 UTC (permalink / raw)
To: buildroot
On 06/02/12 18:13, Thomas Petazzoni wrote:
> +LIBXMLRPC_VERSION = 1.18.05
> +LIBXMLRPC_SOURCE = xmlrpc-c-$(LIBXMLRPC_VERSION).tgz
> +LIBXMLRPC_SITE ="http://xmlrpc-c.svn.sourceforge.net/viewvc/xmlrpc-c/advanced/?view=tar&pathrev=1716"
It's a bit strange to use a three-year-old unstable version...
From the website:
Latest Tarballs
Series Number
Development unnumbered
Advanced 1.30.06
Stable 1.25.16
Super Stable 1.16.41
[snip]
> +# Override the download step since we don't have the normal
> +# site/source split (where site is the URL of the directory and source
> +# is the name of the tarball file).
> +$(LIBXMLRPC_DIR)/.stamp_downloaded:
> + $(Q)$(call MESSAGE,"Downloading")
> + $(call DOWNLOAD,$(LIBXMLRPC_SITE),$(LIBXMLRPC_SOURCE))
> + $(Q)mkdir -p $(@D)
> + $(Q)touch $@
A simpler solution would be to just use the svn download method, from
https://xmlrpc-c.svn.sourceforge.net/svnroot/xmlrpc-c/stable/
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286540
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 39+ messages in thread* [Buildroot] [PATCH] libxmlrpc: new package
2012-06-04 23:58 ` Arnout Vandecappelle
@ 2013-10-09 9:46 ` Alvaro G. M
2013-10-09 11:43 ` Thomas Petazzoni
0 siblings, 1 reply; 39+ messages in thread
From: Alvaro G. M @ 2013-10-09 9:46 UTC (permalink / raw)
To: buildroot
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
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))
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH] libxmlrpc: new package
2013-10-09 9:46 ` [Buildroot] [PATCH] " Alvaro G. M
@ 2013-10-09 11:43 ` Thomas Petazzoni
2013-10-09 12:08 ` Alvaro Gamez
0 siblings, 1 reply; 39+ messages in thread
From: Thomas Petazzoni @ 2013-10-09 11:43 UTC (permalink / raw)
To: buildroot
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
--
Thomas Petazzoni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH] libxmlrpc: new package
2013-10-09 11:43 ` Thomas Petazzoni
@ 2013-10-09 12:08 ` Alvaro Gamez
2013-10-09 12:16 ` Alvaro G. M
0 siblings, 1 reply; 39+ messages in thread
From: Alvaro Gamez @ 2013-10-09 12:08 UTC (permalink / raw)
To: buildroot
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
--
?lvaro G?mez Machado
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20131009/0ecef81e/attachment-0001.html>
^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH] libxmlrpc: new package
2013-10-09 12:08 ` Alvaro Gamez
@ 2013-10-09 12:16 ` Alvaro G. M
2013-10-09 13:09 ` Thomas De Schampheleire
0 siblings, 1 reply; 39+ messages in thread
From: Alvaro G. M @ 2013-10-09 12:16 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Alvaro G. M <alvaro.gamez@hazent.com>
---
package/Config.in | 1 +
package/libxmlrpc/Config.in | 10 ++++++++
.../libxmlrpc-01-fix-gennmtab-build.patch | 25 ++++++++++++++++++
.../libxmlrpc-02-fix-non-cplusplus-build.patch | 27 +++++++++++++++++++
.../libxmlrpc/libxmlrpc-03-non-wchar-build.patch | 24 +++++++++++++++++
.../libxmlrpc-04-use-correct-curl-config.patch | 22 ++++++++++++++++
package/libxmlrpc/libxmlrpc.mk | 30 ++++++++++++++++++++++
7 files changed, 139 insertions(+)
create mode 100644 package/libxmlrpc/Config.in
create mode 100644 package/libxmlrpc/libxmlrpc-01-fix-gennmtab-build.patch
create mode 100644 package/libxmlrpc/libxmlrpc-02-fix-non-cplusplus-build.patch
create mode 100644 package/libxmlrpc/libxmlrpc-03-non-wchar-build.patch
create mode 100644 package/libxmlrpc/libxmlrpc-04-use-correct-curl-config.patch
create mode 100644 package/libxmlrpc/libxmlrpc.mk
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-01-fix-gennmtab-build.patch b/package/libxmlrpc/libxmlrpc-01-fix-gennmtab-build.patch
new file mode 100644
index 0000000..8cdd932
--- /dev/null
+++ b/package/libxmlrpc/libxmlrpc-01-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-02-fix-non-cplusplus-build.patch b/package/libxmlrpc/libxmlrpc-02-fix-non-cplusplus-build.patch
new file mode 100644
index 0000000..efeb9cc
--- /dev/null
+++ b/package/libxmlrpc/libxmlrpc-02-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-03-non-wchar-build.patch b/package/libxmlrpc/libxmlrpc-03-non-wchar-build.patch
new file mode 100644
index 0000000..1f04353
--- /dev/null
+++ b/package/libxmlrpc/libxmlrpc-03-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-04-use-correct-curl-config.patch b/package/libxmlrpc/libxmlrpc-04-use-correct-curl-config.patch
new file mode 100644
index 0000000..ada0bd2
--- /dev/null
+++ b/package/libxmlrpc/libxmlrpc-04-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..956dae9
--- /dev/null
+++ b/package/libxmlrpc/libxmlrpc.mk
@@ -0,0 +1,30 @@
+################################################################################
+#
+# 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_LICENSE = BSD-like, Expat, Python 1.5.2 License
+LIBXMLRPC_LICENSE_FILES = doc/COPYING
+LIBXMLRPC_INSTALL_STAGING = YES
+LIBXMLRPC_DEPENDENCIES = libcurl
+LIBXMLRPC_CONFIG_SCRIPTS = xmlrpc-c-config
+
+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)"
+
+$(eval $(autotools-package))
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH] libxmlrpc: new package
2013-10-09 12:16 ` Alvaro G. M
@ 2013-10-09 13:09 ` Thomas De Schampheleire
2013-10-09 13:21 ` Alvaro Gamez
2013-10-10 6:49 ` Arnout Vandecappelle
0 siblings, 2 replies; 39+ messages in thread
From: Thomas De Schampheleire @ 2013-10-09 13:09 UTC (permalink / raw)
To: buildroot
Hi Alvaro,
On Wed, Oct 9, 2013 at 2:16 PM, Alvaro G. M <alvaro.gamez@hazent.com> wrote:
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Signed-off-by: Alvaro G. M <alvaro.gamez@hazent.com>
> ---
> package/Config.in | 1 +
> package/libxmlrpc/Config.in | 10 ++++++++
> .../libxmlrpc-01-fix-gennmtab-build.patch | 25 ++++++++++++++++++
> .../libxmlrpc-02-fix-non-cplusplus-build.patch | 27 +++++++++++++++++++
> .../libxmlrpc/libxmlrpc-03-non-wchar-build.patch | 24 +++++++++++++++++
> .../libxmlrpc-04-use-correct-curl-config.patch | 22 ++++++++++++++++
> package/libxmlrpc/libxmlrpc.mk | 30 ++++++++++++++++++++++
> 7 files changed, 139 insertions(+)
> create mode 100644 package/libxmlrpc/Config.in
> create mode 100644 package/libxmlrpc/libxmlrpc-01-fix-gennmtab-build.patch
> create mode 100644 package/libxmlrpc/libxmlrpc-02-fix-non-cplusplus-build.patch
> create mode 100644 package/libxmlrpc/libxmlrpc-03-non-wchar-build.patch
> create mode 100644 package/libxmlrpc/libxmlrpc-04-use-correct-curl-config.patch
> create mode 100644 package/libxmlrpc/libxmlrpc.mk
We have had a long discussion on two buildroot developer days about
the format of the number in patch names. I thought we had decided to
use a four-digit format to correspond to the patches generated with
git. So this should be 0001, 0002, etc.
However, this may be mis-remembered by me, so I'm including some of
the people involved in that discussion to this mail...
>
> 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"
This alphabetical order is not correct, libxmlrpc should come after libxmlpp.
> 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-01-fix-gennmtab-build.patch b/package/libxmlrpc/libxmlrpc-01-fix-gennmtab-build.patch
> new file mode 100644
> index 0000000..8cdd932
> --- /dev/null
> +++ b/package/libxmlrpc/libxmlrpc-01-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-02-fix-non-cplusplus-build.patch b/package/libxmlrpc/libxmlrpc-02-fix-non-cplusplus-build.patch
> new file mode 100644
> index 0000000..efeb9cc
> --- /dev/null
> +++ b/package/libxmlrpc/libxmlrpc-02-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-03-non-wchar-build.patch b/package/libxmlrpc/libxmlrpc-03-non-wchar-build.patch
> new file mode 100644
> index 0000000..1f04353
> --- /dev/null
> +++ b/package/libxmlrpc/libxmlrpc-03-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-04-use-correct-curl-config.patch b/package/libxmlrpc/libxmlrpc-04-use-correct-curl-config.patch
> new file mode 100644
> index 0000000..ada0bd2
> --- /dev/null
> +++ b/package/libxmlrpc/libxmlrpc-04-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..956dae9
> --- /dev/null
> +++ b/package/libxmlrpc/libxmlrpc.mk
> @@ -0,0 +1,30 @@
> +################################################################################
> +#
> +# 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"
Why are there quotes around the URL?
> +LIBXMLRPC_LICENSE = BSD-like, Expat, Python 1.5.2 License
> +LIBXMLRPC_LICENSE_FILES = doc/COPYING
Are these three licenses used on identifyable parts of libxmlrpc, such
that you could be more specific, like
BSD-like (partA), Expat (partB) etc.?
Also, what exactly do you mean with BSD-like? Is it possible to map
onto one of the standard strings specified in
http://buildroot.uclibc.org/downloads/manual/manual.html#legal-info-list-licenses
?
And finally, if there are three licenses, I'd expect three license
files, unless the file doc/COPYING accumulates the license texts of
all three licenses. Can you confirm?
> +LIBXMLRPC_INSTALL_STAGING = YES
> +LIBXMLRPC_DEPENDENCIES = libcurl
> +LIBXMLRPC_CONFIG_SCRIPTS = xmlrpc-c-config
> +
> +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)"
> +
> +$(eval $(autotools-package))
> --
Best regards,
Thomas
^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH] libxmlrpc: new package
2013-10-09 13:09 ` Thomas De Schampheleire
@ 2013-10-09 13:21 ` Alvaro Gamez
2013-10-09 13:46 ` Thomas De Schampheleire
2013-10-10 6:49 ` Arnout Vandecappelle
1 sibling, 1 reply; 39+ messages in thread
From: Alvaro Gamez @ 2013-10-09 13:21 UTC (permalink / raw)
To: buildroot
Hi Thomas,
2013/10/9 Thomas De Schampheleire <patrickdepinguin@gmail.com>
> We have had a long discussion on two buildroot developer days about
> the format of the number in patch names. I thought we had decided to
> use a four-digit format to correspond to the patches generated with
> git. So this should be 0001, 0002, etc.
> However, this may be mis-remembered by me, so I'm including some of
> the people involved in that discussion to this mail...
>
Sorry, I didn't read that. Whatever has been decided is fine.
>
> > 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"
>
> This alphabetical order is not correct, libxmlrpc should come after
> libxmlpp.
>
Oops.
>
> > +LIBXMLRPC_SITE = "
> http://downloads.sourceforge.net/project/xmlrpc-c/Xmlrpc-c%20Super%20Stable/1.25.26
> "
>
> Why are there quotes around the URL?
>
To be honest, I don't know. I guess I copied that from somewhere and the
quotes where already there.
> > +LIBXMLRPC_LICENSE = BSD-like, Expat, Python 1.5.2 License
> > +LIBXMLRPC_LICENSE_FILES = doc/COPYING
>
> Are these three licenses used on identifyable parts of libxmlrpc, such
> that you could be more specific, like
> BSD-like (partA), Expat (partB) etc.?
>
> Also, what exactly do you mean with BSD-like? Is it possible to map
> onto one of the standard strings specified in
>
> http://buildroot.uclibc.org/downloads/manual/manual.html#legal-info-list-licenses
> ?
>
> And finally, if there are three licenses, I'd expect three license
> files, unless the file doc/COPYING accumulates the license texts of
> all three licenses. Can you confirm?
>
Yes, the file doc/COPYING contains the three license texts. It explains
which license applies to what:
You can read it here
http://sourceforge.net/p/xmlrpc-c/code/HEAD/tree/trunk/doc/COPYING
and I'll comment a little on everything:
> All the code written specifically for Xmlrpc-c, which is most
> of the code, and the aggregation, is licensed under the
> XML-RPC FOR C/C++ license shown below.
This license is, as I understand it, is basically just BSD-3c, I guess.
> The Expat Licence applies to the contents of the directory lib/expat,
This is kind of a BSD license where "everything" is allowed with only one
requisite
"The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software."
> the ABYSS Web Server License applies to the contents of the directory
> lib/abyss and parts of the file src/xmlrpc_abyss.c.
This is again BSD-3c license, I think
> The Python 1.5.2 license applies to parts of the file
> src/xmlrpc_base64.c.
I guess I could just type all that as
BSD-3c (xml-rpc main code, lib/expat and abyss web server), Python 1.5.2
license (xmlrpc_base64.c)
What do you think?
Regards
--
?lvaro G?mez Machado
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20131009/e8a95457/attachment.html>
^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH] libxmlrpc: new package
2013-10-09 13:21 ` Alvaro Gamez
@ 2013-10-09 13:46 ` Thomas De Schampheleire
2013-10-09 13:57 ` Alvaro Gamez
0 siblings, 1 reply; 39+ messages in thread
From: Thomas De Schampheleire @ 2013-10-09 13:46 UTC (permalink / raw)
To: buildroot
Hi Alvaro,
On Wed, Oct 9, 2013 at 3:21 PM, Alvaro Gamez <alvaro.gamez@hazent.com> wrote:
>>
>> > +LIBXMLRPC_LICENSE = BSD-like, Expat, Python 1.5.2 License
>> > +LIBXMLRPC_LICENSE_FILES = doc/COPYING
>>
>> Are these three licenses used on identifyable parts of libxmlrpc, such
>> that you could be more specific, like
>> BSD-like (partA), Expat (partB) etc.?
>>
>> Also, what exactly do you mean with BSD-like? Is it possible to map
>> onto one of the standard strings specified in
>>
>> http://buildroot.uclibc.org/downloads/manual/manual.html#legal-info-list-licenses
>> ?
>>
>> And finally, if there are three licenses, I'd expect three license
>> files, unless the file doc/COPYING accumulates the license texts of
>> all three licenses. Can you confirm?
>
>
> Yes, the file doc/COPYING contains the three license texts. It explains
> which license applies to what:
>
> You can read it here
>
> http://sourceforge.net/p/xmlrpc-c/code/HEAD/tree/trunk/doc/COPYING
>
> and I'll comment a little on everything:
>
>
>> All the code written specifically for Xmlrpc-c, which is most
>> of the code, and the aggregation, is licensed under the
>> XML-RPC FOR C/C++ license shown below.
>
> This license is, as I understand it, is basically just BSD-3c, I guess.
>
>
>> The Expat Licence applies to the contents of the directory lib/expat,
>
> This is kind of a BSD license where "everything" is allowed with only one
> requisite
> "The above copyright notice and this permission notice shall be included
> in all copies or substantial portions of the Software."
>
>
>> the ABYSS Web Server License applies to the contents of the directory
>> lib/abyss and parts of the file src/xmlrpc_abyss.c.
>
> This is again BSD-3c license, I think
>
>
>> The Python 1.5.2 license applies to parts of the file
>> src/xmlrpc_base64.c.
>
>
> I guess I could just type all that as
>
> BSD-3c (xml-rpc main code, lib/expat and abyss web server), Python 1.5.2
> license (xmlrpc_base64.c)
>
> What do you think?
I think this is clearer, yes.
Note that doc/COPYING says 'parts of src/xmlrpc_base64.c' so I would
reproduce that text as-is.
Thanks,
Thomas
^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH] libxmlrpc: new package
2013-10-09 13:46 ` Thomas De Schampheleire
@ 2013-10-09 13:57 ` Alvaro Gamez
2013-10-09 13:58 ` Alvaro G. M
0 siblings, 1 reply; 39+ messages in thread
From: Alvaro Gamez @ 2013-10-09 13:57 UTC (permalink / raw)
To: buildroot
All right, I'm sending the whole patch again.
I've removed those quotes, preserved the alphabetical order, renumbered the
patches with four digits and rewritten the license text. Since expat is
bsd-like but with only one clause I've left it like this:
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)
2013/10/9 Thomas De Schampheleire <patrickdepinguin@gmail.com>
> Hi Alvaro,
>
> On Wed, Oct 9, 2013 at 3:21 PM, Alvaro Gamez <alvaro.gamez@hazent.com>
> wrote:
> >>
> >> > +LIBXMLRPC_LICENSE = BSD-like, Expat, Python 1.5.2 License
> >> > +LIBXMLRPC_LICENSE_FILES = doc/COPYING
> >>
> >> Are these three licenses used on identifyable parts of libxmlrpc, such
> >> that you could be more specific, like
> >> BSD-like (partA), Expat (partB) etc.?
> >>
> >> Also, what exactly do you mean with BSD-like? Is it possible to map
> >> onto one of the standard strings specified in
> >>
> >>
> http://buildroot.uclibc.org/downloads/manual/manual.html#legal-info-list-licenses
> >> ?
> >>
> >> And finally, if there are three licenses, I'd expect three license
> >> files, unless the file doc/COPYING accumulates the license texts of
> >> all three licenses. Can you confirm?
> >
> >
> > Yes, the file doc/COPYING contains the three license texts. It explains
> > which license applies to what:
> >
> > You can read it here
> >
> > http://sourceforge.net/p/xmlrpc-c/code/HEAD/tree/trunk/doc/COPYING
> >
> > and I'll comment a little on everything:
> >
> >
> >> All the code written specifically for Xmlrpc-c, which is most
> >> of the code, and the aggregation, is licensed under the
> >> XML-RPC FOR C/C++ license shown below.
> >
> > This license is, as I understand it, is basically just BSD-3c, I guess.
> >
> >
> >> The Expat Licence applies to the contents of the directory lib/expat,
> >
> > This is kind of a BSD license where "everything" is allowed with only one
> > requisite
> > "The above copyright notice and this permission notice shall be included
> > in all copies or substantial portions of the Software."
> >
> >
> >> the ABYSS Web Server License applies to the contents of the directory
> >> lib/abyss and parts of the file src/xmlrpc_abyss.c.
> >
> > This is again BSD-3c license, I think
> >
> >
> >> The Python 1.5.2 license applies to parts of the file
> >> src/xmlrpc_base64.c.
> >
> >
> > I guess I could just type all that as
> >
> > BSD-3c (xml-rpc main code, lib/expat and abyss web server), Python 1.5.2
> > license (xmlrpc_base64.c)
> >
> > What do you think?
>
> I think this is clearer, yes.
> Note that doc/COPYING says 'parts of src/xmlrpc_base64.c' so I would
> reproduce that text as-is.
>
> Thanks,
> Thomas
>
--
?lvaro G?mez Machado
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20131009/50b02fe9/attachment.html>
^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH] libxmlrpc: new package
2013-10-09 13:57 ` Alvaro Gamez
@ 2013-10-09 13:58 ` Alvaro G. M
2013-10-09 14:09 ` Baruch Siach
0 siblings, 1 reply; 39+ messages in thread
From: Alvaro G. M @ 2013-10-09 13:58 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Config.in | 1 +
package/libxmlrpc/Config.in | 10 ++++++++
.../libxmlrpc-0001-fix-gennmtab-build.patch | 25 ++++++++++++++++++
.../libxmlrpc-0002-fix-non-cplusplus-build.patch | 27 +++++++++++++++++++
.../libxmlrpc/libxmlrpc-0003-non-wchar-build.patch | 24 +++++++++++++++++
.../libxmlrpc-0004-use-correct-curl-config.patch | 22 ++++++++++++++++
package/libxmlrpc/libxmlrpc.mk | 30 ++++++++++++++++++++++
7 files changed, 139 insertions(+)
create mode 100644 package/libxmlrpc/Config.in
create mode 100644 package/libxmlrpc/libxmlrpc-0001-fix-gennmtab-build.patch
create mode 100644 package/libxmlrpc/libxmlrpc-0002-fix-non-cplusplus-build.patch
create mode 100644 package/libxmlrpc/libxmlrpc-0003-non-wchar-build.patch
create mode 100644 package/libxmlrpc/libxmlrpc-0004-use-correct-curl-config.patch
create mode 100644 package/libxmlrpc/libxmlrpc.mk
diff --git a/package/Config.in b/package/Config.in
index 9aa9d81..7947e8e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -728,6 +728,7 @@ source "package/libroxml/Config.in"
source "package/libxml-parser-perl/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"
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-0001-fix-gennmtab-build.patch b/package/libxmlrpc/libxmlrpc-0001-fix-gennmtab-build.patch
new file mode 100644
index 0000000..8cdd932
--- /dev/null
+++ b/package/libxmlrpc/libxmlrpc-0001-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-0002-fix-non-cplusplus-build.patch b/package/libxmlrpc/libxmlrpc-0002-fix-non-cplusplus-build.patch
new file mode 100644
index 0000000..efeb9cc
--- /dev/null
+++ b/package/libxmlrpc/libxmlrpc-0002-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-0003-non-wchar-build.patch b/package/libxmlrpc/libxmlrpc-0003-non-wchar-build.patch
new file mode 100644
index 0000000..1f04353
--- /dev/null
+++ b/package/libxmlrpc/libxmlrpc-0003-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-0004-use-correct-curl-config.patch b/package/libxmlrpc/libxmlrpc-0004-use-correct-curl-config.patch
new file mode 100644
index 0000000..ada0bd2
--- /dev/null
+++ b/package/libxmlrpc/libxmlrpc-0004-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..78ba161
--- /dev/null
+++ b/package/libxmlrpc/libxmlrpc.mk
@@ -0,0 +1,30 @@
+################################################################################
+#
+# 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_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)
+LIBXMLRPC_LICENSE_FILES = doc/COPYING
+LIBXMLRPC_INSTALL_STAGING = YES
+LIBXMLRPC_DEPENDENCIES = libcurl
+LIBXMLRPC_CONFIG_SCRIPTS = xmlrpc-c-config
+
+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)"
+
+$(eval $(autotools-package))
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH] libxmlrpc: new package
2013-10-09 13:58 ` Alvaro G. M
@ 2013-10-09 14:09 ` Baruch Siach
2013-10-09 14:19 ` Alvaro G. M
0 siblings, 1 reply; 39+ messages in thread
From: Baruch Siach @ 2013-10-09 14:09 UTC (permalink / raw)
To: buildroot
Hi Alvaro,
On Wed, Oct 09, 2013 at 03:58:39PM +0200, Alvaro G. M wrote:
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
You forgot your own sign off.
[...]
> diff --git a/package/libxmlrpc/libxmlrpc.mk b/package/libxmlrpc/libxmlrpc.mk
> new file mode 100644
> index 0000000..78ba161
> --- /dev/null
> +++ b/package/libxmlrpc/libxmlrpc.mk
> @@ -0,0 +1,30 @@
> +################################################################################
> +#
> +# 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
Why not reuse $(LIBXMLRPC_VERSION) for the directory part of the URL?
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 39+ messages in thread* [Buildroot] [PATCH] libxmlrpc: new package
2013-10-09 14:09 ` Baruch Siach
@ 2013-10-09 14:19 ` Alvaro G. M
2014-03-03 21:58 ` Thomas Petazzoni
0 siblings, 1 reply; 39+ messages in thread
From: Alvaro G. M @ 2013-10-09 14:19 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Alvaro G. M <alvaro.gamez@hazent.com>
---
Solved sign off and reuse LIBXMLRPC_VERSION (thanks Baruch).
package/Config.in | 1 +
package/libxmlrpc/Config.in | 10 ++++++++
.../libxmlrpc-0001-fix-gennmtab-build.patch | 25 ++++++++++++++++++
.../libxmlrpc-0002-fix-non-cplusplus-build.patch | 27 +++++++++++++++++++
.../libxmlrpc/libxmlrpc-0003-non-wchar-build.patch | 24 +++++++++++++++++
.../libxmlrpc-0004-use-correct-curl-config.patch | 22 ++++++++++++++++
package/libxmlrpc/libxmlrpc.mk | 30 ++++++++++++++++++++++
7 files changed, 139 insertions(+)
create mode 100644 package/libxmlrpc/Config.in
create mode 100644 package/libxmlrpc/libxmlrpc-0001-fix-gennmtab-build.patch
create mode 100644 package/libxmlrpc/libxmlrpc-0002-fix-non-cplusplus-build.patch
create mode 100644 package/libxmlrpc/libxmlrpc-0003-non-wchar-build.patch
create mode 100644 package/libxmlrpc/libxmlrpc-0004-use-correct-curl-config.patch
create mode 100644 package/libxmlrpc/libxmlrpc.mk
diff --git a/package/Config.in b/package/Config.in
index 9aa9d81..7947e8e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -728,6 +728,7 @@ source "package/libroxml/Config.in"
source "package/libxml-parser-perl/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"
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-0001-fix-gennmtab-build.patch b/package/libxmlrpc/libxmlrpc-0001-fix-gennmtab-build.patch
new file mode 100644
index 0000000..8cdd932
--- /dev/null
+++ b/package/libxmlrpc/libxmlrpc-0001-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-0002-fix-non-cplusplus-build.patch b/package/libxmlrpc/libxmlrpc-0002-fix-non-cplusplus-build.patch
new file mode 100644
index 0000000..efeb9cc
--- /dev/null
+++ b/package/libxmlrpc/libxmlrpc-0002-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-0003-non-wchar-build.patch b/package/libxmlrpc/libxmlrpc-0003-non-wchar-build.patch
new file mode 100644
index 0000000..1f04353
--- /dev/null
+++ b/package/libxmlrpc/libxmlrpc-0003-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-0004-use-correct-curl-config.patch b/package/libxmlrpc/libxmlrpc-0004-use-correct-curl-config.patch
new file mode 100644
index 0000000..ada0bd2
--- /dev/null
+++ b/package/libxmlrpc/libxmlrpc-0004-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..3d1af7e
--- /dev/null
+++ b/package/libxmlrpc/libxmlrpc.mk
@@ -0,0 +1,30 @@
+################################################################################
+#
+# 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/$(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)
+LIBXMLRPC_LICENSE_FILES = doc/COPYING
+LIBXMLRPC_INSTALL_STAGING = YES
+LIBXMLRPC_DEPENDENCIES = libcurl
+LIBXMLRPC_CONFIG_SCRIPTS = xmlrpc-c-config
+
+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)"
+
+$(eval $(autotools-package))
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH] libxmlrpc: new package
2013-10-09 13:09 ` Thomas De Schampheleire
2013-10-09 13:21 ` Alvaro Gamez
@ 2013-10-10 6:49 ` Arnout Vandecappelle
2013-10-10 7:47 ` Alvaro Gamez
1 sibling, 1 reply; 39+ messages in thread
From: Arnout Vandecappelle @ 2013-10-10 6:49 UTC (permalink / raw)
To: buildroot
On 10/09/13 15:09, Thomas De Schampheleire wrote:
> Hi Alvaro,
>
> On Wed, Oct 9, 2013 at 2:16 PM, Alvaro G. M<alvaro.gamez@hazent.com> wrote:
>> >Signed-off-by: Thomas Petazzoni<thomas.petazzoni@free-electrons.com>
>> >Signed-off-by: Alvaro G. M<alvaro.gamez@hazent.com>
>> >---
>> > package/Config.in | 1 +
>> > package/libxmlrpc/Config.in | 10 ++++++++
>> > .../libxmlrpc-01-fix-gennmtab-build.patch | 25 ++++++++++++++++++
>> > .../libxmlrpc-02-fix-non-cplusplus-build.patch | 27 +++++++++++++++++++
>> > .../libxmlrpc/libxmlrpc-03-non-wchar-build.patch | 24 +++++++++++++++++
>> > .../libxmlrpc-04-use-correct-curl-config.patch | 22 ++++++++++++++++
>> > package/libxmlrpc/libxmlrpc.mk | 30 ++++++++++++++++++++++
>> > 7 files changed, 139 insertions(+)
>> > create mode 100644 package/libxmlrpc/Config.in
>> > create mode 100644 package/libxmlrpc/libxmlrpc-01-fix-gennmtab-build.patch
>> > create mode 100644 package/libxmlrpc/libxmlrpc-02-fix-non-cplusplus-build.patch
>> > create mode 100644 package/libxmlrpc/libxmlrpc-03-non-wchar-build.patch
>> > create mode 100644 package/libxmlrpc/libxmlrpc-04-use-correct-curl-config.patch
>> > create mode 100644 package/libxmlrpc/libxmlrpc.mk
> We have had a long discussion on two buildroot developer days about
> the format of the number in patch names. I thought we had decided to
> use a four-digit format to correspond to the patches generated with
> git. So this should be 0001, 0002, etc.
> However, this may be mis-remembered by me, so I'm including some of
> the people involved in that discussion to this mail...
AFAICR we concluded that it wasn't necessary to enforce four digits,
since very few of the patches are generated from git anyway.
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH] libxmlrpc: new package
2013-10-10 6:49 ` Arnout Vandecappelle
@ 2013-10-10 7:47 ` Alvaro Gamez
0 siblings, 0 replies; 39+ messages in thread
From: Alvaro Gamez @ 2013-10-10 7:47 UTC (permalink / raw)
To: buildroot
Well, that's true (as is the case in this particular patch), but it's also
true that it doesn't make any bad. It's just a minor inconvenience and it
gives some consistency to the files name, I think I mostly like it.
Regards
2013/10/10 Arnout Vandecappelle <arnout@mind.be>
> On 10/09/13 15:09, Thomas De Schampheleire wrote:
>
>> Hi Alvaro,
>>
>> On Wed, Oct 9, 2013 at 2:16 PM, Alvaro G. M<alvaro.gamez@hazent.com>
>> wrote:
>>
>>> >Signed-off-by: Thomas Petazzoni<thomas.petazzoni@**free-electrons.com<thomas.petazzoni@free-electrons.com>
>>> >
>>> >Signed-off-by: Alvaro G. M<alvaro.gamez@hazent.com>
>>> >---
>>> > package/Config.in | 1 +
>>> > package/libxmlrpc/Config.in | 10 ++++++++
>>> > .../libxmlrpc-01-fix-gennmtab-**build.patch | 25
>>> ++++++++++++++++++
>>> > .../libxmlrpc-02-fix-non-**cplusplus-build.patch | 27
>>> +++++++++++++++++++
>>> > .../libxmlrpc/libxmlrpc-03-**non-wchar-build.patch | 24
>>> +++++++++++++++++
>>> > .../libxmlrpc-04-use-correct-**curl-config.patch | 22
>>> ++++++++++++++++
>>> > package/libxmlrpc/libxmlrpc.mk | 30
>>> ++++++++++++++++++++++
>>> > 7 files changed, 139 insertions(+)
>>> > create mode 100644 package/libxmlrpc/Config.in
>>> > create mode 100644 package/libxmlrpc/libxmlrpc-**
>>> 01-fix-gennmtab-build.patch
>>> > create mode 100644 package/libxmlrpc/libxmlrpc-**
>>> 02-fix-non-cplusplus-build.**patch
>>> > create mode 100644 package/libxmlrpc/libxmlrpc-**
>>> 03-non-wchar-build.patch
>>> > create mode 100644 package/libxmlrpc/libxmlrpc-**
>>> 04-use-correct-curl-config.**patch
>>> > create mode 100644 package/libxmlrpc/libxmlrpc.mk
>>>
>> We have had a long discussion on two buildroot developer days about
>> the format of the number in patch names. I thought we had decided to
>> use a four-digit format to correspond to the patches generated with
>> git. So this should be 0001, 0002, etc.
>> However, this may be mis-remembered by me, so I'm including some of
>> the people involved in that discussion to this mail...
>>
>
> AFAICR we concluded that it wasn't necessary to enforce four digits,
> since very few of the patches are generated from git anyway.
>
> Regards,
> Arnout
>
>
> --
> Arnout Vandecappelle arnout at mind be
> Senior Embedded Software Architect +32-16-286500
> Essensium/Mind http://www.mind.be
> G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
> LinkedIn profile: http://www.linkedin.com/in/**arnoutvandecappelle<http://www.linkedin.com/in/arnoutvandecappelle>
> GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
>
--
?lvaro G?mez Machado
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20131010/8cc1d135/attachment.html>
^ permalink raw reply [flat|nested] 39+ messages in thread
[parent not found: <4FCD4B6D.3080506@mind.be>]
* [Buildroot] [PATCH 03/10] libxmlrpc: new package
[not found] ` <4FCD4B6D.3080506@mind.be>
@ 2012-06-05 21:26 ` Thomas Petazzoni
2013-01-12 20:17 ` Peter Korsgaard
0 siblings, 1 reply; 39+ messages in thread
From: Thomas Petazzoni @ 2012-06-05 21:26 UTC (permalink / raw)
To: buildroot
Hello,
Le Tue, 05 Jun 2012 01:57:33 +0200,
Arnout Vandecappelle <arnout@mind.be> a ?crit :
> On 06/02/12 18:13, Thomas Petazzoni wrote:
> > +LIBXMLRPC_VERSION = 1.18.05
> > +LIBXMLRPC_SOURCE = xmlrpc-c-$(LIBXMLRPC_VERSION).tgz
> > +LIBXMLRPC_SITE ="http://xmlrpc-c.svn.sourceforge.net/viewvc/xmlrpc-c/advanced/?view=tar&pathrev=1716"
>
> It's a bit strange to use a three-year-old unstable version...
> From the website:
>
> Latest Tarballs
> Series Number
> Development unnumbered
> Advanced 1.30.06
> Stable 1.25.16
> Super Stable 1.16.41
This package comes from a customer project, and the customer had its
software running with this version, so that's the version I tested. Of
course, packaging more recent versions would be better, but I thought
that having the package would be better than nothing.
> A simpler solution would be to just use the svn download method, from
> https://xmlrpc-c.svn.sourceforge.net/svnroot/xmlrpc-c/stable/
Sure, I'll look into that.
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 39+ messages in thread* [Buildroot] [PATCH 03/10] libxmlrpc: new package
2012-06-05 21:26 ` [Buildroot] [PATCH 03/10] " Thomas Petazzoni
@ 2013-01-12 20:17 ` Peter Korsgaard
2013-01-13 14:08 ` Thomas Petazzoni
0 siblings, 1 reply; 39+ messages in thread
From: Peter Korsgaard @ 2013-01-12 20:17 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Hi Thomas,
Old mail ..
Thomas> Hello,
Thomas> Le Tue, 05 Jun 2012 01:57:33 +0200,
Thomas> Arnout Vandecappelle <arnout@mind.be> a ?crit :
>> On 06/02/12 18:13, Thomas Petazzoni wrote:
>> > +LIBXMLRPC_VERSION = 1.18.05
>> > +LIBXMLRPC_SOURCE = xmlrpc-c-$(LIBXMLRPC_VERSION).tgz
>> > +LIBXMLRPC_SITE ="http://xmlrpc-c.svn.sourceforge.net/viewvc/xmlrpc-c/advanced/?view=tar&pathrev=1716"
>>
>> It's a bit strange to use a three-year-old unstable version...
>> From the website:
>>
>> Latest Tarballs
>> Series Number
>> Development unnumbered
>> Advanced 1.30.06
>> Stable 1.25.16
>> Super Stable 1.16.41
Thomas> This package comes from a customer project, and the customer had its
Thomas> software running with this version, so that's the version I tested. Of
Thomas> course, packaging more recent versions would be better, but I thought
Thomas> that having the package would be better than nothing.
>> A simpler solution would be to just use the svn download method, from
>> https://xmlrpc-c.svn.sourceforge.net/svnroot/xmlrpc-c/stable/
Thomas> Sure, I'll look into that.
Any news on this?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH 03/10] libxmlrpc: new package
2013-01-12 20:17 ` Peter Korsgaard
@ 2013-01-13 14:08 ` Thomas Petazzoni
2013-01-13 16:10 ` Peter Korsgaard
0 siblings, 1 reply; 39+ messages in thread
From: Thomas Petazzoni @ 2013-01-13 14:08 UTC (permalink / raw)
To: buildroot
Dear Peter Korsgaard,
On Sat, 12 Jan 2013 21:17:29 +0100, Peter Korsgaard wrote:
> >> A simpler solution would be to just use the svn download method, from
> >> https://xmlrpc-c.svn.sourceforge.net/svnroot/xmlrpc-c/stable/
>
> Thomas> Sure, I'll look into that.
>
> Any news on this?
At this point, I am no longer that much interested by xmlrpc. It was
for a project on which I'm no longer working, and I don't expect many
people to use this stuff, so I don't want to spend too much time
packaging this.
I'd say you can discard the patch in patchwork, and be done with it :)
Thanks!
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH 03/10] libxmlrpc: new package
2013-01-13 14:08 ` Thomas Petazzoni
@ 2013-01-13 16:10 ` Peter Korsgaard
0 siblings, 0 replies; 39+ messages in thread
From: Peter Korsgaard @ 2013-01-13 16:10 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> Dear Peter Korsgaard,
Thomas> On Sat, 12 Jan 2013 21:17:29 +0100, Peter Korsgaard wrote:
>> >> A simpler solution would be to just use the svn download method, from
>> >> https://xmlrpc-c.svn.sourceforge.net/svnroot/xmlrpc-c/stable/
>>
Thomas> Sure, I'll look into that.
>>
>> Any news on this?
Thomas> At this point, I am no longer that much interested by xmlrpc. It was
Thomas> for a project on which I'm no longer working, and I don't expect many
Thomas> people to use this stuff, so I don't want to spend too much time
Thomas> packaging this.
Thomas> I'd say you can discard the patch in patchwork, and be done with it :)
Ok, will do.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH 04/10] llrp-toolkit: new package
2012-06-02 16:13 [Buildroot] [pull request] Pull request for branch for-2012.08/new-packages Thomas Petazzoni
` (2 preceding siblings ...)
2012-06-02 16:13 ` [Buildroot] [PATCH 03/10] libxmlrpc: new package Thomas Petazzoni
@ 2012-06-02 16:13 ` Thomas Petazzoni
2012-06-02 16:13 ` [Buildroot] [PATCH 05/10] qextserialport: " Thomas Petazzoni
` (5 subsequent siblings)
9 siblings, 0 replies; 39+ messages in thread
From: Thomas Petazzoni @ 2012-06-02 16:13 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Config.in | 1 +
package/llrp-toolkit/Config.in | 11 ++
| 74 +++++++++
...toolkit-02-ltkcpp-generate-shared-library.patch | 43 +++++
...-toolkit-03-ltkcpp-normalize-build-system.patch | 174 ++++++++++++++++++++
.../llrp-toolkit-04-ltkcpp-disable-warning.patch | 43 +++++
.../llrp-toolkit-05-ltkc-shared-library.patch | 26 +++
...rp-toolkit-06-ltkc-normalize-build-system.patch | 163 ++++++++++++++++++
package/llrp-toolkit/llrp-toolkit.mk | 77 +++++++++
9 files changed, 612 insertions(+)
create mode 100644 package/llrp-toolkit/Config.in
create mode 100644 package/llrp-toolkit/llrp-toolkit-01-ltkcpp-fix-headers.patch
create mode 100644 package/llrp-toolkit/llrp-toolkit-02-ltkcpp-generate-shared-library.patch
create mode 100644 package/llrp-toolkit/llrp-toolkit-03-ltkcpp-normalize-build-system.patch
create mode 100644 package/llrp-toolkit/llrp-toolkit-04-ltkcpp-disable-warning.patch
create mode 100644 package/llrp-toolkit/llrp-toolkit-05-ltkc-shared-library.patch
create mode 100644 package/llrp-toolkit/llrp-toolkit-06-ltkc-normalize-build-system.patch
create mode 100644 package/llrp-toolkit/llrp-toolkit.mk
diff --git a/package/Config.in b/package/Config.in
index 044b59b..4af638f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -368,6 +368,7 @@ source "package/libnfc/Config.in"
source "package/libusb/Config.in"
source "package/libusb-compat/Config.in"
source "package/libv4l/Config.in"
+source "package/llrp-toolkit/Config.in"
endmenu
menu "Javascript"
diff --git a/package/llrp-toolkit/Config.in b/package/llrp-toolkit/Config.in
new file mode 100644
index 0000000..c0cac32
--- /dev/null
+++ b/package/llrp-toolkit/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_LLRP_TOOLKIT
+ bool "llrp-toolkit"
+ select BR2_PACKAGE_LIBXML2
+ help
+ A software toolkit for using the EPCglobal Low Level Reader
+ Protocol (LLRP) to communicate with conforming RFID readers.
+
+ This package installs the C and C++ libraries of LLRP
+ Toolkit, respectively called ltkc and ltkcpp.
+
+ http://sourceforge.net/projects/llrp-toolkit/
--git a/package/llrp-toolkit/llrp-toolkit-01-ltkcpp-fix-headers.patch b/package/llrp-toolkit/llrp-toolkit-01-ltkcpp-fix-headers.patch
new file mode 100644
index 0000000..5fd40ed
--- /dev/null
+++ b/package/llrp-toolkit/llrp-toolkit-01-ltkcpp-fix-headers.patch
@@ -0,0 +1,74 @@
+ltkcpp: Add missing header inclusions
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/LTKCPP/Examples/example1.cpp
+===================================================================
+--- a/LTKCPP/Examples/example1.cpp
++++ b/LTKCPP/Examples/example1.cpp
+@@ -49,6 +49,7 @@
+
+
+ #include <stdio.h>
++#include <stdlib.h>
+
+ #include "ltkcpp.h"
+
+Index: b/LTKCPP/Library/ltkcpp_connection.h
+===================================================================
+--- a/LTKCPP/Library/ltkcpp_connection.h
++++ b/LTKCPP/Library/ltkcpp_connection.h
+@@ -27,6 +27,7 @@
+ **
+ *****************************************************************************/
+
++#include <time.h>
+
+ namespace LLRP
+ {
+Index: b/LTKCPP/Library/ltkcpp_platform.h
+===================================================================
+--- a/LTKCPP/Library/ltkcpp_platform.h
++++ b/LTKCPP/Library/ltkcpp_platform.h
+@@ -36,6 +36,9 @@
+
+ #include <list>
+ #include <string.h> /* memcpy() */
++#ifdef linux
++#include <stdint.h>
++#endif
+
+ #define FALSE 0
+ #define TRUE 1
+@@ -52,7 +55,6 @@
+ */
+
+ #ifdef linux
+-#include <stdint.h>
+ /** Basic type for LLRP 8-bit unsigned data values*/
+ typedef uint8_t llrp_u8_t;
+ /** Basic type for LLRP 8-bit signed data values*/
+Index: b/LTKCPP/Tests/dx201.cpp
+===================================================================
+--- a/LTKCPP/Tests/dx201.cpp
++++ b/LTKCPP/Tests/dx201.cpp
+@@ -57,6 +57,7 @@
+ #ifdef linux
+ #include <unistd.h>
+ #endif
++#include <stdlib.h>
+
+ #include "ltkcpp.h"
+
+Index: b/LTKCPP/Tests/llrp2xml.cpp
+===================================================================
+--- a/LTKCPP/Tests/llrp2xml.cpp
++++ b/LTKCPP/Tests/llrp2xml.cpp
+@@ -54,6 +54,7 @@
+
+
+ #include <stdio.h>
++#include <stdlib.h>
+
+ #include "ltkcpp.h"
+
diff --git a/package/llrp-toolkit/llrp-toolkit-02-ltkcpp-generate-shared-library.patch b/package/llrp-toolkit/llrp-toolkit-02-ltkcpp-generate-shared-library.patch
new file mode 100644
index 0000000..b0b87be
--- /dev/null
+++ b/package/llrp-toolkit/llrp-toolkit-02-ltkcpp-generate-shared-library.patch
@@ -0,0 +1,43 @@
+ltkcpp: Generate shared library instead of static one
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/LTKCPP/Library/Makefile
+===================================================================
+--- a/LTKCPP/Library/Makefile
++++ b/LTKCPP/Library/Makefile
+@@ -16,7 +16,6 @@
+ ############################################################################
+
+ #CPPFLAGS = -O -Wall
+-AR = ar
+ CXX = g++
+ CPPFLAGS = -g -Wall -I../../opensource/include/libxml2
+
+@@ -34,7 +33,7 @@
+ ltkcpp_xmltext.h \
+ out_ltkcpp.h
+
+-LTKCPP_LIB = libltkcpp.a
++LTKCPP_LIB = libltkcpp.so
+ LTKCPP_OBJS = \
+ ltkcpp_array.o \
+ ltkcpp_connection.o \
+@@ -58,7 +57,7 @@
+ make all
+
+ $(LTKCPP_LIB) : $(LTKCPP_OBJS)
+- $(AR) crv $(LTKCPP_LIB) $(LTKCPP_OBJS)
++ $(CXX) $(CPPFLAGS) -shared -lxml2 -o $@ $^
+
+ $(LTKCPP_OBJS) : $(LTKCPP_HDRS)
+
+@@ -122,7 +121,7 @@
+ clean:
+ rm -f *.o *.core core.[0-9]*
+ rm -f out_*.inc out_*.h
+- rm -f *.a
++ rm -f *.so
+ cd LLRP.org; make clean
+
+ # Handy target to generate code when building with Visual Studio
diff --git a/package/llrp-toolkit/llrp-toolkit-03-ltkcpp-normalize-build-system.patch b/package/llrp-toolkit/llrp-toolkit-03-ltkcpp-normalize-build-system.patch
new file mode 100644
index 0000000..d5587a7
--- /dev/null
+++ b/package/llrp-toolkit/llrp-toolkit-03-ltkcpp-normalize-build-system.patch
@@ -0,0 +1,174 @@
+ltkcpp: normalize build system
+
+ * Use the system provided libxml2
+
+ * Don't override CXX/CPPFLAGS
+
+ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/LTKCPP/Examples/Makefile
+===================================================================
+--- a/LTKCPP/Examples/Makefile
++++ b/LTKCPP/Examples/Makefile
+@@ -18,12 +18,6 @@
+ LIBDIR=../Library
+ INCL = -I$(LIBDIR)
+
+-#CPPFLAGS = -O -Wall $(INCL)
+-AR = ar
+-CXX = g++
+-CPPFLAGS = -g -Wall $(INCL)
+-
+-LTKCPP_LIB = $(LIBDIR)/libltkcpp.a
+ LTKCPP_HDRS = \
+ $(LIBDIR)/ltkcpp.h \
+ $(LIBDIR)/ltkcpp_base.h \
+@@ -39,10 +33,10 @@
+ make all
+
+ example1 : example1.o $(LTKCPP_LIB)
+- $(CXX) $(CPPFLAGS) -o example1 example1.o $(LTKCPP_LIB)
++ $(CXX) $(CXXFLAGS) -o example1 example1.o -lltkcpp
+
+ example1.o : example1.cpp $(LTKCPP_HDRS)
+- $(CXX) -c $(CPPFLAGS) example1.cpp -o example1.o
++ $(CXX) -c $(CXXFLAGS) example1.cpp -o example1.o
+
+ clean:
+ rm -f *.o *.core core.[0-9]*
+Index: b/LTKCPP/Library/Makefile
+===================================================================
+--- a/LTKCPP/Library/Makefile
++++ b/LTKCPP/Library/Makefile
+@@ -15,10 +15,6 @@
+ #
+ ############################################################################
+
+-#CPPFLAGS = -O -Wall
+-CXX = g++
+-CPPFLAGS = -g -Wall -I../../opensource/include/libxml2
+-
+ LLRPDEF = ../../Definitions/Core/llrp-1x0-def.xml
+
+ CODE_GEN_H_XSLT = ltkcpp_gen_h.xslt
+@@ -57,57 +53,57 @@
+ make all
+
+ $(LTKCPP_LIB) : $(LTKCPP_OBJS)
+- $(CXX) $(CPPFLAGS) -shared -lxml2 -o $@ $^
++ $(CXX) $(CXXFLAGS) -shared -lxml2 -o $@ $^
+
+ $(LTKCPP_OBJS) : $(LTKCPP_HDRS)
+
+ ltkcpp_array.o : ltkcpp_array.cpp
+- $(CXX) -c $(CPPFLAGS) ltkcpp_array.cpp \
++ $(CXX) -c $(CXXFLAGS) ltkcpp_array.cpp \
+ -o ltkcpp_array.o
+
+ ltkcpp_connection.o : ltkcpp_connection.cpp
+- $(CXX) -c $(CPPFLAGS) ltkcpp_connection.cpp \
++ $(CXX) -c $(CXXFLAGS) ltkcpp_connection.cpp \
+ -o ltkcpp_connection.o
+
+ ltkcpp_element.o : ltkcpp_element.cpp
+- $(CXX) -c $(CPPFLAGS) ltkcpp_element.cpp \
++ $(CXX) -c $(CXXFLAGS) ltkcpp_element.cpp \
+ -o ltkcpp_element.o
+
+ ltkcpp_encdec.o : ltkcpp_encdec.cpp
+- $(CXX) -c $(CPPFLAGS) ltkcpp_encdec.cpp \
++ $(CXX) -c $(CXXFLAGS) ltkcpp_encdec.cpp \
+ -o ltkcpp_encdec.o
+
+ ltkcpp_error.o : ltkcpp_error.cpp
+- $(CXX) -c $(CPPFLAGS) ltkcpp_error.cpp \
++ $(CXX) -c $(CXXFLAGS) ltkcpp_error.cpp \
+ -o ltkcpp_error.o
+
+ ltkcpp_framedecode.o : ltkcpp_framedecode.cpp
+- $(CXX) -c $(CPPFLAGS) ltkcpp_framedecode.cpp \
++ $(CXX) -c $(CXXFLAGS) ltkcpp_framedecode.cpp \
+ -o ltkcpp_framedecode.o
+
+ ltkcpp_frameencode.o : ltkcpp_frameencode.cpp
+- $(CXX) -c $(CPPFLAGS) ltkcpp_frameencode.cpp \
++ $(CXX) -c $(CXXFLAGS) ltkcpp_frameencode.cpp \
+ -o ltkcpp_frameencode.o
+
+ ltkcpp_frameextract.o : ltkcpp_frameextract.cpp
+- $(CXX) -c $(CPPFLAGS) ltkcpp_frameextract.cpp \
++ $(CXX) -c $(CXXFLAGS) ltkcpp_frameextract.cpp \
+ -o ltkcpp_frameextract.o
+
+ ltkcpp_hdrfd.o : ltkcpp_hdrfd.cpp
+- $(CXX) -c $(CPPFLAGS) ltkcpp_hdrfd.cpp \
++ $(CXX) -c $(CXXFLAGS) ltkcpp_hdrfd.cpp \
+ -o ltkcpp_hdrfd.o
+
+ ltkcpp_xmltextencode.o : ltkcpp_xmltextencode.cpp
+- $(CXX) -c $(CPPFLAGS) ltkcpp_xmltextencode.cpp \
++ $(CXX) -c $(CXXFLAGS) ltkcpp_xmltextencode.cpp \
+ -o ltkcpp_xmltextencode.o
+
+ ltkcpp_typeregistry.o : ltkcpp_typeregistry.cpp
+- $(CXX) -c $(CPPFLAGS) ltkcpp_typeregistry.cpp \
++ $(CXX) -c $(CXXFLAGS) ltkcpp_typeregistry.cpp \
+ -o ltkcpp_typeregistry.o
+
+ ltkcpp_genout.o : out_ltkcpp.inc out_ltkcpp.h
+ ltkcpp_genout.o : ltkcpp_genout.cpp
+- $(CXX) -c $(CPPFLAGS) -Wno-unused ltkcpp_genout.cpp \
++ $(CXX) -c $(CXXFLAGS) -Wno-unused ltkcpp_genout.cpp \
+ -o ltkcpp_genout.o
+
+ out_ltkcpp.h: ltkcpp_gen_h.xslt $(LLRPDEF)
+Index: b/LTKCPP/Tests/Makefile
+===================================================================
+--- a/LTKCPP/Tests/Makefile
++++ b/LTKCPP/Tests/Makefile
+@@ -16,16 +16,7 @@
+ ############################################################################
+
+ LIBDIR=../Library
+-XML2DIR=../../opensource/include/libxml2
+-INCL = -I$(LIBDIR) -I$(XML2DIR)
+
+-#CPPFLAGS = -O -Wall $(INCL)
+-AR = ar
+-CXX = g++
+-CPPFLAGS = -g -Wall $(INCL)
+-
+-LTKCPP_LIB = $(LIBDIR)/libltkcpp.a
+-XML2_LIB = ../../opensource/lib/libxml2.a
+ LTKCPP_HDRS = \
+ $(LIBDIR)/ltkcpp.h \
+ $(LIBDIR)/ltkcpp_base.h \
+@@ -41,22 +32,22 @@
+ make all
+
+ xml2llrp : xml2llrp.o $(LTKCPP_LIB) $(XML2_LIB)
+- $(CXX) $(CPPFLAGS) -o xml2llrp xml2llrp.o $(LTKCPP_LIB) $(XML2_LIB)
++ $(CXX) $(CXXFLAGS) -o xml2llrp xml2llrp.o -lltkcpp -lxml2
+
+ xml2llrp.o : xml2llrp.cpp $(LTKCPP_HDRS)
+- $(CXX) -c $(CPPFLAGS) xml2llrp.cpp -o xml2llrp.o
++ $(CXX) -c $(CXXFLAGS) xml2llrp.cpp -o xml2llrp.o
+
+ llrp2xml : llrp2xml.o $(LTKCPP_LIB)
+- $(CXX) $(CPPFLAGS) -o llrp2xml llrp2xml.o $(LTKCPP_LIB)
++ $(CXX) $(CXXFLAGS) -o llrp2xml llrp2xml.o -lltkcpp
+
+ llrp2xml.o : llrp2xml.cpp $(LTKCPP_HDRS)
+- $(CXX) -c $(CPPFLAGS) llrp2xml.cpp -o llrp2xml.o
++ $(CXX) -c $(CXXFLAGS) llrp2xml.cpp -o llrp2xml.o
+
+ dx201 : dx201.o $(LTKCPP_LIB)
+- $(CXX) $(CPPFLAGS) -o dx201 dx201.o $(LTKCPP_LIB)
++ $(CXX) $(CXXFLAGS) -o dx201 dx201.o -lltkcpp
+
+ dx201.o : dx201.cpp $(LTKCPP_HDRS)
+- $(CXX) -c $(CPPFLAGS) dx201.cpp -o dx201.o
++ $(CXX) -c $(CXXFLAGS) dx201.cpp -o dx201.o
+
+ clean:
+ rm -f *.o *.core core.[0-9]*
diff --git a/package/llrp-toolkit/llrp-toolkit-04-ltkcpp-disable-warning.patch b/package/llrp-toolkit/llrp-toolkit-04-ltkcpp-disable-warning.patch
new file mode 100644
index 0000000..964a47f
--- /dev/null
+++ b/package/llrp-toolkit/llrp-toolkit-04-ltkcpp-disable-warning.patch
@@ -0,0 +1,43 @@
+ltkcpp: add -Wno-write-strings to silence warnings
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/LTKCPP/Examples/Makefile
+===================================================================
+--- a/LTKCPP/Examples/Makefile
++++ b/LTKCPP/Examples/Makefile
+@@ -18,6 +18,8 @@
+ LIBDIR=../Library
+ INCL = -I$(LIBDIR)
+
++override CXXFLAGS += -Wno-write-strings
++
+ LTKCPP_HDRS = \
+ $(LIBDIR)/ltkcpp.h \
+ $(LIBDIR)/ltkcpp_base.h \
+Index: b/LTKCPP/Library/Makefile
+===================================================================
+--- a/LTKCPP/Library/Makefile
++++ b/LTKCPP/Library/Makefile
+@@ -17,6 +17,8 @@
+
+ LLRPDEF = ../../Definitions/Core/llrp-1x0-def.xml
+
++override CXXFLAGS += -Wno-write-strings
++
+ CODE_GEN_H_XSLT = ltkcpp_gen_h.xslt
+ CODE_GEN_CPP_XSLT = ltkcpp_gen_cpp.xslt
+
+Index: b/LTKCPP/Tests/Makefile
+===================================================================
+--- a/LTKCPP/Tests/Makefile
++++ b/LTKCPP/Tests/Makefile
+@@ -17,6 +17,8 @@
+
+ LIBDIR=../Library
+
++override CXXFLAGS += -Wno-write-strings
++
+ LTKCPP_HDRS = \
+ $(LIBDIR)/ltkcpp.h \
+ $(LIBDIR)/ltkcpp_base.h \
diff --git a/package/llrp-toolkit/llrp-toolkit-05-ltkc-shared-library.patch b/package/llrp-toolkit/llrp-toolkit-05-ltkc-shared-library.patch
new file mode 100644
index 0000000..e562d5c
--- /dev/null
+++ b/package/llrp-toolkit/llrp-toolkit-05-ltkc-shared-library.patch
@@ -0,0 +1,26 @@
+ltkc: generate shared library instead of static one
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/LTKC/Library/Makefile
+===================================================================
+--- a/LTKC/Library/Makefile
++++ b/LTKC/Library/Makefile
+@@ -35,7 +35,7 @@
+ ltkc_xmltext.h \
+ out_ltkc.h
+
+-LTKC_LIB = libltkc.a
++LTKC_LIB = libltkc.so
+ LTKC_OBJS = \
+ ltkc_array.o \
+ ltkc_connection.o \
+@@ -59,7 +59,7 @@
+ make all
+
+ $(LTKC_LIB) : $(LTKC_OBJS)
+- $(AR) crv $(LTKC_LIB) $(LTKC_OBJS)
++ $(CC) $(CFLAGS) -shared -o $@ $^
+
+ $(LTKC_OBJS) : $(LTKC_HDRS)
+
diff --git a/package/llrp-toolkit/llrp-toolkit-06-ltkc-normalize-build-system.patch b/package/llrp-toolkit/llrp-toolkit-06-ltkc-normalize-build-system.patch
new file mode 100644
index 0000000..8bca417
--- /dev/null
+++ b/package/llrp-toolkit/llrp-toolkit-06-ltkc-normalize-build-system.patch
@@ -0,0 +1,163 @@
+ltkc: normalize build system
+
+ * Use system libxml2 instead of the one bundled with llrp-toolkit
+
+ * Do not redefine variables like CC, CFLAGS, etc.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/LTKC/Examples/Makefile
+===================================================================
+--- a/LTKC/Examples/Makefile
++++ b/LTKC/Examples/Makefile
+@@ -18,12 +18,6 @@
+ LIBDIR=../Library
+ INCL = -I$(LIBDIR)
+
+-#CFLAGS = -O -Wall $(INCL)
+-AR = ar
+-CC = gcc
+-CFLAGS = -g -Wall $(INCL)
+-
+-LTKC_LIB = $(LIBDIR)/libltkc.a
+ LTKC_HDRS = \
+ $(LIBDIR)/ltkc.h \
+ $(LIBDIR)/ltkc_base.h \
+@@ -39,7 +33,7 @@
+ make all
+
+ example1 : example1.o $(LTKC_LIB)
+- $(CC) $(CFLAGS) -o example1 example1.o $(LTKC_LIB)
++ $(CC) $(CFLAGS) -o example1 example1.o -lltkc
+
+ example1.o : example1.c $(LTKC_HDRS)
+ $(CC) -c $(CFLAGS) example1.c -o example1.o
+Index: b/LTKC/Library/Makefile
+===================================================================
+--- a/LTKC/Library/Makefile
++++ b/LTKC/Library/Makefile
+@@ -15,12 +15,6 @@
+ #
+ ############################################################################
+
+-#CFLAGS = -O -Wall
+-AR = ar
+-CC = gcc
+-CFLAGS = -g -Wall
+-CINCLUDES = -I ../../opensource/include/libxml2
+-
+ LLRPDEF = ../../Definitions/Core/llrp-1x0-def.xml
+
+ CODE_GEN_H_XSLT = ltkc_gen_h.xslt
+@@ -64,56 +58,56 @@
+ $(LTKC_OBJS) : $(LTKC_HDRS)
+
+ ltkc_array.o : ltkc_array.c
+- $(CC) -c $(CFLAGS) $(CINCLUDES) ltkc_array.c \
++ $(CC) -c $(CFLAGS) ltkc_array.c \
+ -o ltkc_array.o
+
+ ltkc_connection.o : ltkc_connection.c
+- $(CC) -c $(CFLAGS) $(CINCLUDES) ltkc_connection.c \
++ $(CC) -c $(CFLAGS) ltkc_connection.c \
+ -o ltkc_connection.o
+
+ ltkc_element.o : ltkc_element.c
+- $(CC) -c $(CFLAGS) $(CINCLUDES) ltkc_element.c \
++ $(CC) -c $(CFLAGS) ltkc_element.c \
+ -o ltkc_element.o
+
+ ltkc_encdec.o : ltkc_encdec.c
+- $(CC) -c $(CFLAGS) $(CINCLUDES) ltkc_encdec.c \
++ $(CC) -c $(CFLAGS) ltkc_encdec.c \
+ -o ltkc_encdec.o
+
+ ltkc_error.o : ltkc_error.c
+- $(CC) -c $(CFLAGS) $(CINCLUDES) ltkc_error.c \
++ $(CC) -c $(CFLAGS) ltkc_error.c \
+ -o ltkc_error.o
+
+ ltkc_framedecode.o : ltkc_framedecode.c
+- $(CC) -c $(CFLAGS) $(CINCLUDES) ltkc_framedecode.c \
++ $(CC) -c $(CFLAGS) ltkc_framedecode.c \
+ -o ltkc_framedecode.o
+
+ ltkc_frameencode.o : ltkc_frameencode.c
+- $(CC) -c $(CFLAGS) $(CINCLUDES) ltkc_frameencode.c \
++ $(CC) -c $(CFLAGS) ltkc_frameencode.c \
+ -o ltkc_frameencode.o
+
+ ltkc_frameextract.o : ltkc_frameextract.c
+- $(CC) -c $(CFLAGS) $(CINCLUDES) ltkc_frameextract.c \
++ $(CC) -c $(CFLAGS) ltkc_frameextract.c \
+ -o ltkc_frameextract.o
+
+ ltkc_hdrfd.o : ltkc_hdrfd.c
+- $(CC) -c $(CFLAGS) $(CINCLUDES) ltkc_hdrfd.c \
++ $(CC) -c $(CFLAGS) ltkc_hdrfd.c \
+ -o ltkc_hdrfd.o
+
+ ltkc_xmltextdecode.o : ltkc_xmltextdecode.c
+- $(CC) -c $(CFLAGS) $(CINCLUDES) ltkc_xmltextdecode.c \
++ $(CC) -c $(CFLAGS) ltkc_xmltextdecode.c \
+ -o ltkc_xmltextdecode.o
+
+ ltkc_xmltextencode.o : ltkc_xmltextencode.c
+- $(CC) -c $(CFLAGS) $(CINCLUDES) ltkc_xmltextencode.c \
++ $(CC) -c $(CFLAGS) ltkc_xmltextencode.c \
+ -o ltkc_xmltextencode.o
+
+ ltkc_typeregistry.o : ltkc_typeregistry.c
+- $(CC) -c $(CFLAGS) $(CINCLUDES) ltkc_typeregistry.c \
++ $(CC) -c $(CFLAGS) ltkc_typeregistry.c \
+ -o ltkc_typeregistry.o
+
+ ltkc_genout.o : out_ltkc.inc out_ltkc.h
+ ltkc_genout.o : ltkc_genout.c
+- $(CC) -c $(CFLAGS) $(CINCLUDES) -Wno-unused ltkc_genout.c \
++ $(CC) -c $(CFLAGS) -Wno-unused ltkc_genout.c \
+ -o ltkc_genout.o
+
+ out_ltkc.h: ltkc_gen_h.xslt $(LLRPDEF)
+Index: b/LTKC/Tests/Makefile
+===================================================================
+--- a/LTKC/Tests/Makefile
++++ b/LTKC/Tests/Makefile
+@@ -16,16 +16,8 @@
+ ############################################################################
+
+ LIBDIR=../Library
+-XML2DIR=../../opensource/include/libxml2
+-INCL = -I$(LIBDIR) -I$(XML2DIR)
++INCL = -I$(LIBDIR)
+
+-#CFLAGS = -O -Wall $(INCL)
+-AR = ar
+-CC = gcc
+-CFLAGS = -g -Wall $(INCL)
+-
+-LTKC_LIB = $(LIBDIR)/libltkc.a
+-XML2_LIB = ../../opensource/lib/libxml2.a
+ LTKC_HDRS = \
+ $(LIBDIR)/ltkc.h \
+ $(LIBDIR)/ltkc_base.h \
+@@ -44,16 +36,16 @@
+ $(CC) -c $(CFLAGS) llrp2xml.c -o llrp2xml.o
+
+ llrp2xml : llrp2xml.o $(LTKC_LIB)
+- $(CC) $(CFLAGS) -o llrp2xml llrp2xml.o $(LTKC_LIB) $(XML2_LIB)
++ $(CC) $(CFLAGS) -o llrp2xml llrp2xml.o -lltkc
+
+ xml2llrp.o : xml2llrp.c $(LTKC_HDRS)
+ $(CC) -c $(CFLAGS) xml2llrp.c -o xml2llrp.o
+
+ xml2llrp : xml2llrp.o $(LTKC_LIB) $(XML2_LIB)
+- $(CC) $(CFLAGS) -o xml2llrp xml2llrp.o $(LTKC_LIB) $(XML2_LIB)
++ $(CC) $(CFLAGS) -o xml2llrp xml2llrp.o -lltkc -lxml2
+
+ dx201 : dx201.o $(LTKC_LIB)
+- $(CC) $(CFLAGS) -o dx201 dx201.o $(LTKC_LIB)
++ $(CC) $(CFLAGS) -o dx201 dx201.o -lltkc
+
+ dx201.o : dx201.c $(LTKC_HDRS)
+ $(CC) -c $(CFLAGS) dx201.c -o dx201.o
diff --git a/package/llrp-toolkit/llrp-toolkit.mk b/package/llrp-toolkit/llrp-toolkit.mk
new file mode 100644
index 0000000..8c98065
--- /dev/null
+++ b/package/llrp-toolkit/llrp-toolkit.mk
@@ -0,0 +1,77 @@
+#############################################################
+#
+# llrp-toolkit
+#
+#############################################################
+
+LLRP_TOOLKIT_VERSION = 1.0.0.8
+LLRP_TOOLKIT_SOURCE = llrp-toolkit-$(LLRP_TOOLKIT_VERSION).tar.gz
+LLRP_TOOLKIT_SITE = "http://llrp-toolkit.cvs.sourceforge.net/viewvc/llrp-toolkit/LTK/?view=tar&pathrev=ltkcpp_1_0_0_8"
+LLRP_TOOLKIT_INSTALL_STAGING = YES
+LLRP_TOOLKIT_DEPENDENCIES = host-libxslt libxml2
+
+ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
+define LLRP_TOOLKIT_BUILD_CPP_LIBRARY
+ $(TARGET_CONFIGURE_OPTS) \
+ CXXFLAGS="$(TARGET_CXXFLAGS) -I$(STAGING_DIR)/usr/include/libxml2" \
+ $(MAKE) -C $(@D)/LTKCPP/Library
+endef
+endif
+
+define LLRP_TOOLKIT_BUILD_C_LIBRARY
+ $(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libxml2" \
+ $(MAKE) -C $(@D)/LTKC/Library
+endef
+
+define LLRP_TOOLKIT_BUILD_CMDS
+ $(LLRP_TOOLKIT_BUILD_CPP_LIBRARY)
+ $(LLRP_TOOLKIT_BUILD_C_LIBRARY)
+endef
+
+ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
+define LLRP_TOOLKIT_INSTALL_STAGING_CPP_LIBRARY
+ $(INSTALL) -D -m 0755 $(@D)/LTKCPP/Library/libltkcpp.so $(STAGING_DIR)/usr/lib/libltkcpp.so
+ for header in $(@D)/LTKCPP/Library/*.h; do \
+ $(INSTALL) -D -m 0644 $${header} $(STAGING_DIR)/usr/include/ltkcpp/`basename $${header}` ; \
+ done
+endef
+endif
+
+define LLRP_TOOLKIT_INSTALL_STAGING_C_LIBRARY
+ $(INSTALL) -D -m 0755 $(@D)/LTKC/Library/libltkc.so $(STAGING_DIR)/usr/lib/libltkc.so
+ for header in $(@D)/LTKC/Library/*.h; do \
+ $(INSTALL) -D -m 0644 $${header} $(STAGING_DIR)/usr/include/ltkc/`basename $${header}` ; \
+ done
+endef
+
+define LLRP_TOOLKIT_INSTALL_STAGING_CMDS
+ $(LLRP_TOOLKIT_INSTALL_STAGING_CPP_LIBRARY)
+ $(LLRP_TOOLKIT_INSTALL_STAGING_C_LIBRARY)
+endef
+
+ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
+define LLRP_TOOLKIT_INSTALL_TARGET_CPP_LIBRARY
+ $(INSTALL) -D -m 0755 $(@D)/LTKCPP/Library/libltkcpp.so $(TARGET_DIR)/usr/lib/libltkcpp.so
+endef
+endif
+
+define LLRP_TOOLKIT_INSTALL_TARGET_C_LIBRARY
+ $(INSTALL) -D -m 0755 $(@D)/LTKC/Library/libltkc.so $(TARGET_DIR)/usr/lib/libltkc.so
+endef
+
+define LLRP_TOOLKIT_INSTALL_TARGET_CMDS
+ $(LLRP_TOOLKIT_INSTALL_TARGET_CPP_LIBRARY)
+ $(LLRP_TOOLKIT_INSTALL_TARGET_C_LIBRARY)
+endef
+
+$(eval $(call GENTARGETS))
+
+# Override the download step since we don't have the normal
+# site/source split (where site is the URL of the directory and source
+# is the name of the tarball file).
+$(LLRP_TOOLKIT_DIR)/.stamp_downloaded:
+ $(Q)$(call MESSAGE,"Downloading")
+ $(call DOWNLOAD,$(LLRP_TOOLKIT_SITE),$(LLRP_TOOLKIT_SOURCE))
+ $(Q)mkdir -p $(@D)
+ $(Q)touch $@
--
1.7.9.5
^ permalink raw reply related [flat|nested] 39+ messages in thread* [Buildroot] [PATCH 05/10] qextserialport: new package
2012-06-02 16:13 [Buildroot] [pull request] Pull request for branch for-2012.08/new-packages Thomas Petazzoni
` (3 preceding siblings ...)
2012-06-02 16:13 ` [Buildroot] [PATCH 04/10] llrp-toolkit: " Thomas Petazzoni
@ 2012-06-02 16:13 ` Thomas Petazzoni
2012-11-03 18:18 ` Peter Korsgaard
2012-06-02 16:13 ` [Buildroot] [PATCH 06/10] pciutils: install headers and libraries in STAGING_DIR Thomas Petazzoni
` (4 subsequent siblings)
9 siblings, 1 reply; 39+ messages in thread
From: Thomas Petazzoni @ 2012-06-02 16:13 UTC (permalink / raw)
To: buildroot
---
package/Config.in | 1 +
package/qextserialport/Config.in | 9 +++++
.../qextserialport-main-include.patch | 15 +++++++++
.../qextserialport-no-examples.patch | 17 ++++++++++
.../qextserialport/qextserialport-pkgconfig.patch | 19 +++++++++++
package/qextserialport/qextserialport.mk | 35 ++++++++++++++++++++
6 files changed, 96 insertions(+)
create mode 100644 package/qextserialport/Config.in
create mode 100644 package/qextserialport/qextserialport-main-include.patch
create mode 100644 package/qextserialport/qextserialport-no-examples.patch
create mode 100644 package/qextserialport/qextserialport-pkgconfig.patch
create mode 100644 package/qextserialport/qextserialport.mk
diff --git a/package/Config.in b/package/Config.in
index 4af638f..53d6bba 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -369,6 +369,7 @@ source "package/libusb/Config.in"
source "package/libusb-compat/Config.in"
source "package/libv4l/Config.in"
source "package/llrp-toolkit/Config.in"
+source "package/qextserialport/Config.in"
endmenu
menu "Javascript"
diff --git a/package/qextserialport/Config.in b/package/qextserialport/Config.in
new file mode 100644
index 0000000..4e92ecf
--- /dev/null
+++ b/package/qextserialport/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_QEXTSERIALPORT
+ bool "qextserialport"
+ # Qt is a big library, we don't want to select it
+ # automatically without the user knowing
+ depends on BR2_PACKAGE_QT
+ help
+ A Qt library to manage serial ports
+
+ http://code.google.com/p/qextserialport/
diff --git a/package/qextserialport/qextserialport-main-include.patch b/package/qextserialport/qextserialport-main-include.patch
new file mode 100644
index 0000000..858f335
--- /dev/null
+++ b/package/qextserialport/qextserialport-main-include.patch
@@ -0,0 +1,15 @@
+Create a main include file QExtSerialPort
+
+This main include file will be installed in
+<QExtSerialPort/QExtSerialPort> so that Qt applications can use this
+library by including header files in a Qt-like style.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: qextserialport-ef4af2a2ee3f/src/QExtSerialPort
+===================================================================
+--- /dev/null
++++ qextserialport-ef4af2a2ee3f/src/QExtSerialPort
+@@ -0,0 +1,2 @@
++#include "qextserialport.h"
++#include "qextserialenumerator.h"
diff --git a/package/qextserialport/qextserialport-no-examples.patch b/package/qextserialport/qextserialport-no-examples.patch
new file mode 100644
index 0000000..c7d2d41
--- /dev/null
+++ b/package/qextserialport/qextserialport-no-examples.patch
@@ -0,0 +1,17 @@
+Disable compilation of examples
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: qextserialport-ef4af2a2ee3f/qextserialport.pro
+===================================================================
+--- qextserialport-ef4af2a2ee3f.orig/qextserialport.pro
++++ qextserialport-ef4af2a2ee3f/qextserialport.pro
+@@ -1,7 +1,4 @@
+ #
+ TEMPLATE = subdirs
+ CONFIG += ordered
+-SUBDIRS = src \
+- examples/enumerator \
+- examples/event
+-
++SUBDIRS = src
diff --git a/package/qextserialport/qextserialport-pkgconfig.patch b/package/qextserialport/qextserialport-pkgconfig.patch
new file mode 100644
index 0000000..d67f3fc
--- /dev/null
+++ b/package/qextserialport/qextserialport-pkgconfig.patch
@@ -0,0 +1,19 @@
+Add a pkgconfig file to ease usage with applications
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: qextserialport-ef4af2a2ee3f/qextserialport.pc
+===================================================================
+--- /dev/null
++++ qextserialport-ef4af2a2ee3f/qextserialport.pc
+@@ -0,0 +1,10 @@
++prefix=/usr
++exec_prefix=${prefix}
++libdir=${prefix}/lib
++includedir=${prefix}/include/QExtSerialPort
++
++Name: QtExtSerialPort
++Description: QtExtSerialPort library
++Version: 1.2.0
++Libs: -L${libdir} -lqextserialport
++Cflags: -I${includedir}
diff --git a/package/qextserialport/qextserialport.mk b/package/qextserialport/qextserialport.mk
new file mode 100644
index 0000000..c632667
--- /dev/null
+++ b/package/qextserialport/qextserialport.mk
@@ -0,0 +1,35 @@
+#############################################################
+#
+# qextserialport
+#
+#############################################################
+
+QEXTSERIALPORT_VERSION = ef4af2a2ee3f
+QEXTSERIALPORT_SITE = https://qextserialport.googlecode.com/hg/
+QEXTSERIALPORT_SITE_METHOD = hg
+
+QEXTSERIALPORT_DEPENDENCIES = qt
+
+QEXTSERIALPORT_INSTALL_STAGING = YES
+
+define QEXTSERIALPORT_CONFIGURE_CMDS
+ (cd $(@D); $(QT_QMAKE))
+endef
+
+define QEXTSERIALPORT_BUILD_CMDS
+ $(MAKE) -C $(@D)
+endef
+
+define QEXTSERIALPORT_INSTALL_STAGING_CMDS
+ mkdir -p $(STAGING_DIR)/usr/include/QExtSerialPort
+ cp $(@D)/src/*.h $(STAGING_DIR)/usr/include/QExtSerialPort/
+ cp $(@D)/src/QExtSerialPort $(STAGING_DIR)/usr/include/QExtSerialPort/
+ cp -a $(@D)/src/build/*.so* $(STAGING_DIR)/usr/lib/
+ cp $(@D)/qextserialport.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+endef
+
+define QEXTSERIALPORT_INSTALL_TARGET_CMDS
+ cp -a $(@D)/src/build/*.so.* $(TARGET_DIR)/usr/lib
+endef
+
+$(eval $(call GENTARGETS))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 39+ messages in thread* [Buildroot] [PATCH 05/10] qextserialport: new package
2012-06-02 16:13 ` [Buildroot] [PATCH 05/10] qextserialport: " Thomas Petazzoni
@ 2012-11-03 18:18 ` Peter Korsgaard
0 siblings, 0 replies; 39+ messages in thread
From: Peter Korsgaard @ 2012-11-03 18:18 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> ---
Thomas> package/Config.in | 1 +
Thomas> package/qextserialport/Config.in | 9 +++++
Thomas> .../qextserialport-main-include.patch | 15 +++++++++
Thomas> .../qextserialport-no-examples.patch | 17 ++++++++++
Thomas> .../qextserialport/qextserialport-pkgconfig.patch | 19 +++++++++++
Thomas> package/qextserialport/qextserialport.mk | 35
Committed with minor fixups to match current buildroot, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH 06/10] pciutils: install headers and libraries in STAGING_DIR
2012-06-02 16:13 [Buildroot] [pull request] Pull request for branch for-2012.08/new-packages Thomas Petazzoni
` (4 preceding siblings ...)
2012-06-02 16:13 ` [Buildroot] [PATCH 05/10] qextserialport: " Thomas Petazzoni
@ 2012-06-02 16:13 ` Thomas Petazzoni
2012-06-11 20:43 ` Peter Korsgaard
2012-06-02 16:13 ` [Buildroot] [PATCH 07/10] dmidecode: new package Thomas Petazzoni
` (3 subsequent siblings)
9 siblings, 1 reply; 39+ messages in thread
From: Thomas Petazzoni @ 2012-06-02 16:13 UTC (permalink / raw)
To: buildroot
There are some tools, like flashrom, that build against libraries of
pciutils.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/pciutils/pciutils.mk | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk
index 37a17c4..7de5fd7 100644
--- a/package/pciutils/pciutils.mk
+++ b/package/pciutils/pciutils.mk
@@ -6,6 +6,7 @@
PCIUTILS_VERSION = 3.1.9
PCIUTILS_SITE = ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
+PCIUTILS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_ZLIB),y)
PCIUTILS_ZLIB=yes
PCIUTILS_DEPENDENCIES += zlib
@@ -50,4 +51,11 @@ define PCIUTILS_INSTALL_TARGET_CMDS
SHARED=$(PCIUTILS_SHARED) install-lib
endef
+define PCIUTILS_INSTALL_STAGING_CMDS
+ $(MAKE) BUILDDIR=$(@D) -C $(@D) PREFIX=$(STAGING_DIR)/usr \
+ SHARED=$(PCIUTILS_SHARED) install
+ $(MAKE) BUILDDIR=$(@D) -C $(@D) PREFIX=$(STAGING_DIR)/usr \
+ SHARED=$(PCIUTILS_SHARED) install-lib
+endef
+
$(eval $(call GENTARGETS))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 39+ messages in thread* [Buildroot] [PATCH 07/10] dmidecode: new package
2012-06-02 16:13 [Buildroot] [pull request] Pull request for branch for-2012.08/new-packages Thomas Petazzoni
` (5 preceding siblings ...)
2012-06-02 16:13 ` [Buildroot] [PATCH 06/10] pciutils: install headers and libraries in STAGING_DIR Thomas Petazzoni
@ 2012-06-02 16:13 ` Thomas Petazzoni
2012-06-11 20:44 ` Peter Korsgaard
2012-06-02 16:13 ` [Buildroot] [PATCH 08/10] flashrom: " Thomas Petazzoni
` (2 subsequent siblings)
9 siblings, 1 reply; 39+ messages in thread
From: Thomas Petazzoni @ 2012-06-02 16:13 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Config.in | 1 +
package/dmidecode/Config.in | 9 +++++
.../dmidecode/dmidecode-build-system-fixes.patch | 35 ++++++++++++++++++++
package/dmidecode/dmidecode.mk | 18 ++++++++++
4 files changed, 63 insertions(+)
create mode 100644 package/dmidecode/Config.in
create mode 100644 package/dmidecode/dmidecode-build-system-fixes.patch
create mode 100644 package/dmidecode/dmidecode.mk
diff --git a/package/Config.in b/package/Config.in
index 53d6bba..09ca9dd 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -173,6 +173,7 @@ source "package/dbus-python/Config.in"
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/devmem2/Config.in"
endif
+source "package/dmidecode/Config.in"
source "package/dmraid/Config.in"
source "package/dosfstools/Config.in"
source "package/e2fsprogs/Config.in"
diff --git a/package/dmidecode/Config.in b/package/dmidecode/Config.in
new file mode 100644
index 0000000..22272ed
--- /dev/null
+++ b/package/dmidecode/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_DMIDECODE
+ bool "dmidecode"
+ depends on BR2_i386 || BR2_x86_64
+ help
+ Dmidecode reports information about your system's hardware
+ as described in your system BIOS according to the SMBIOS/DMI
+ standard.
+
+ http://www.nongnu.org/dmidecode/
diff --git a/package/dmidecode/dmidecode-build-system-fixes.patch b/package/dmidecode/dmidecode-build-system-fixes.patch
new file mode 100644
index 0000000..275f9df
--- /dev/null
+++ b/package/dmidecode/dmidecode-build-system-fixes.patch
@@ -0,0 +1,35 @@
+Minor build system fixes
+
+Usual build system fixes to allow CC/CFLAGS/LDFLAGS to be overriden
+from the command line, and completed by additional flags from the
+Makefile.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -12,9 +12,10 @@
+ # (at your option) any later version.
+ #
+
+-CC = gcc
+-CFLAGS = -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
+- -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline -Wundef
++CC ?= gcc
++override CFLAGS += \
++ -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
++ -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline -Wundef
+ #CFLAGS += -DBIGENDIAN
+ #CFLAGS += -DALIGNMENT_WORKAROUND
+
+@@ -23,7 +24,7 @@
+ #CFLAGS += -g
+
+ # Pass linker flags here
+-LDFLAGS =
++override LDFLAGS +=
+
+ DESTDIR =
+ prefix = /usr/local
diff --git a/package/dmidecode/dmidecode.mk b/package/dmidecode/dmidecode.mk
new file mode 100644
index 0000000..a036a7a
--- /dev/null
+++ b/package/dmidecode/dmidecode.mk
@@ -0,0 +1,18 @@
+#############################################################
+#
+# dmidecode
+#
+#############################################################
+
+DMIDECODE_VERSION = 2.11
+DMIDECODE_SITE = http://download.savannah.gnu.org/releases/dmidecode/
+
+define DMIDECODE_BUILD_CMDS
+ $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS)
+endef
+
+define DMIDECODE_INSTALL_TARGET_CMDS
+ $(MAKE) -C $(@D) prefix=/usr DESTDIR=$(TARGET_DIR) install
+endef
+
+$(eval $(call GENTARGETS))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 39+ messages in thread* [Buildroot] [PATCH 08/10] flashrom: new package
2012-06-02 16:13 [Buildroot] [pull request] Pull request for branch for-2012.08/new-packages Thomas Petazzoni
` (6 preceding siblings ...)
2012-06-02 16:13 ` [Buildroot] [PATCH 07/10] dmidecode: new package Thomas Petazzoni
@ 2012-06-02 16:13 ` Thomas Petazzoni
2012-06-11 20:48 ` Peter Korsgaard
2012-06-02 16:13 ` [Buildroot] [PATCH 09/10] qt: make $(HOST_DIR)/usr/mkspecs a symlink to $(STAGING_DIR)/usr/mkspecs Thomas Petazzoni
2012-06-02 16:14 ` [Buildroot] [PATCH 10/10] libqwt: new package Thomas Petazzoni
9 siblings, 1 reply; 39+ messages in thread
From: Thomas Petazzoni @ 2012-06-02 16:13 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Config.in | 1 +
package/flashrom/Config.in | 11 +++++++++++
package/flashrom/flashrom.mk | 20 ++++++++++++++++++++
3 files changed, 32 insertions(+)
create mode 100644 package/flashrom/Config.in
create mode 100644 package/flashrom/flashrom.mk
diff --git a/package/Config.in b/package/Config.in
index 09ca9dd..36a2cd0 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -178,6 +178,7 @@ source "package/dmraid/Config.in"
source "package/dosfstools/Config.in"
source "package/e2fsprogs/Config.in"
source "package/eeprog/Config.in"
+source "package/flashrom/Config.in"
source "package/fconfig/Config.in"
source "package/fis/Config.in"
source "package/fmtools/Config.in"
diff --git a/package/flashrom/Config.in b/package/flashrom/Config.in
new file mode 100644
index 0000000..956500f
--- /dev/null
+++ b/package/flashrom/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_FLASHROM
+ bool "flashrom"
+ select BR2_PACKAGE_PCIUTILS
+ # dmidecode is only a runtime dependency
+ select BR2_PACKAGE_DMIDECODE
+ depends on BR2_i386 || BR2_x86_64
+ help
+ BIOS-updating utility.
+ Requires PCIUtils libraries.
+
+ http://flashrom.org/
diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk
new file mode 100644
index 0000000..323469a
--- /dev/null
+++ b/package/flashrom/flashrom.mk
@@ -0,0 +1,20 @@
+#############################################################
+#
+# flashrom
+#
+#############################################################
+FLASHROM_VERSION = 0.9.3
+FLASHROM_SOURCE = flashrom-$(FLASHROM_VERSION).tar.bz2
+FLASHROM_SITE = http://download.flashrom.org/releases
+
+FLASHROM_DEPENDENCIES = pciutils
+
+define FLASHROM_BUILD_CMDS
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+endef
+
+define FLASHROM_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 -D $(@D)/flashrom $(TARGET_DIR)/usr/bin/flashrom
+endef
+
+$(eval $(call GENTARGETS))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 39+ messages in thread* [Buildroot] [PATCH 08/10] flashrom: new package
2012-06-02 16:13 ` [Buildroot] [PATCH 08/10] flashrom: " Thomas Petazzoni
@ 2012-06-11 20:48 ` Peter Korsgaard
0 siblings, 0 replies; 39+ messages in thread
From: Peter Korsgaard @ 2012-06-11 20:48 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas> ---
Thomas> +#############################################################
Thomas> +#
Thomas> +# flashrom
Thomas> +#
Thomas> +#############################################################
Thomas> +FLASHROM_VERSION = 0.9.3
Thomas> +FLASHROM_SOURCE = flashrom-$(FLASHROM_VERSION).tar.bz2
Thomas> +FLASHROM_SITE = http://download.flashrom.org/releases
Thomas> +
Thomas> +FLASHROM_DEPENDENCIES = pciutils
Thomas> +
Thomas> +define FLASHROM_BUILD_CMDS
Thomas> + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
Thomas> +endef
Thomas> +
Thomas> +define FLASHROM_INSTALL_TARGET_CMDS
Thomas> + $(INSTALL) -m 0755 -D $(@D)/flashrom $(TARGET_DIR)/usr/bin/flashrom
I would have expected something like this doing hw access should go into
/usr/sbin, and that's also where Debian places it so I've changed that
and committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH 09/10] qt: make $(HOST_DIR)/usr/mkspecs a symlink to $(STAGING_DIR)/usr/mkspecs
2012-06-02 16:13 [Buildroot] [pull request] Pull request for branch for-2012.08/new-packages Thomas Petazzoni
` (7 preceding siblings ...)
2012-06-02 16:13 ` [Buildroot] [PATCH 08/10] flashrom: " Thomas Petazzoni
@ 2012-06-02 16:13 ` Thomas Petazzoni
2012-06-11 20:50 ` Peter Korsgaard
2012-06-02 16:14 ` [Buildroot] [PATCH 10/10] libqwt: new package Thomas Petazzoni
9 siblings, 1 reply; 39+ messages in thread
From: Thomas Petazzoni @ 2012-06-02 16:13 UTC (permalink / raw)
To: buildroot
In fact, not only qt can install stuff in $(STAGING_DIR)/usr/mkspecs,
but also libraries that which to integrate with qmake, such as
qwt. However, qmake and al. will look inside $(HOST_DIR)/usr/mkspecs,
so the easiest solution is to have a symbolic between the two
directories, instead of copying things around.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/qt/qt.mk | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 7e6c5dd..b751696 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -583,8 +583,7 @@ define QT_INSTALL_STAGING_CMDS
$(MAKE) -C $(@D) install
mkdir -p $(HOST_DIR)/usr/bin
mv $(addprefix $(STAGING_DIR)/usr/bin/,$(QT_HOST_PROGRAMS)) $(HOST_DIR)/usr/bin
- rm -rf $(HOST_DIR)/usr/mkspecs
- mv $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/usr
+ ln -sf $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/usr/mkspecs
$(QT_INSTALL_QT_CONF)
endef
--
1.7.9.5
^ permalink raw reply related [flat|nested] 39+ messages in thread* [Buildroot] [PATCH 10/10] libqwt: new package
2012-06-02 16:13 [Buildroot] [pull request] Pull request for branch for-2012.08/new-packages Thomas Petazzoni
` (8 preceding siblings ...)
2012-06-02 16:13 ` [Buildroot] [PATCH 09/10] qt: make $(HOST_DIR)/usr/mkspecs a symlink to $(STAGING_DIR)/usr/mkspecs Thomas Petazzoni
@ 2012-06-02 16:14 ` Thomas Petazzoni
2012-09-10 9:06 ` Yegor Yefremov
2013-01-13 21:45 ` Peter Korsgaard
9 siblings, 2 replies; 39+ messages in thread
From: Thomas Petazzoni @ 2012-06-02 16:14 UTC (permalink / raw)
To: buildroot
From: Laurent GONZALEZ <br2@gezedo.com>
Patch initially written by Thomas Petazzoni, then reworked and updated
by Laurent Gonzalez, and finally cleaned up by Thomas again.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Config.in | 1 +
package/libqwt/Config.in | 23 +++++++++
package/libqwt/libqwt-remove-installed-check.patch | 32 ++++++++++++
package/libqwt/libqwt.mk | 51 ++++++++++++++++++++
4 files changed, 107 insertions(+)
create mode 100644 package/libqwt/Config.in
create mode 100644 package/libqwt/libqwt-remove-installed-check.patch
create mode 100644 package/libqwt/libqwt.mk
diff --git a/package/Config.in b/package/Config.in
index 36a2cd0..d3a1444 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -348,6 +348,7 @@ source "package/libglade/Config.in"
source "package/gdk-pixbuf/Config.in"
source "package/libgtk2/Config.in"
source "package/libpng/Config.in"
+source "package/libqwt/Config.in"
source "package/libraw/Config.in"
source "package/librsvg/Config.in"
source "package/libsvgtiny/Config.in"
diff --git a/package/libqwt/Config.in b/package/libqwt/Config.in
new file mode 100644
index 0000000..48b27ca
--- /dev/null
+++ b/package/libqwt/Config.in
@@ -0,0 +1,23 @@
+config BR2_PACKAGE_LIBQWT
+ bool "libqwt"
+ depends on BR2_PACKAGE_QT
+ select BR2_PACKAGE_QT_GUI_MODULE
+ help
+ Qwt is a graphics extension to the Qt GUI application
+ framework. It provides a 2D plotting widget and more.
+
+ http://http://sourceforge.net/projects/qwt
+
+if BR2_PACKAGE_LIBQWT
+
+config BR2_PACKAGE_LIBQWT_SVG
+ bool "SVG support"
+ select BR2_PACKAGE_QT_SVG
+
+config BR2_PACKAGE_LIBQWT_MATHML
+ bool "MathML support"
+
+endif
+
+comment "libqwt requires qt"
+ depends on !BR2_PACKAGE_QT
diff --git a/package/libqwt/libqwt-remove-installed-check.patch b/package/libqwt/libqwt-remove-installed-check.patch
new file mode 100644
index 0000000..7490a7b
--- /dev/null
+++ b/package/libqwt/libqwt-remove-installed-check.patch
@@ -0,0 +1,32 @@
+Remove useless check at build time
+
+At build time, Qwt looks whether the Qwt libraries are already
+installed in the destination directory, to avoid confusion between
+libraries installed system-wide and locally-built shared
+libraries. However, this behaviour conflicts with how Buildroot builds
+and installs libraries, so get rid of it.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: qwt-6.0.0/qwtbuild.pri
+===================================================================
+--- qwt-6.0.0.orig/qwtbuild.pri 2011-09-12 19:37:35.663275952 +0200
++++ qwt-6.0.0/qwtbuild.pri 2011-09-12 19:37:41.913275949 +0200
+@@ -53,17 +53,3 @@
+ !debug_and_release {
+ OBJECTS_DIR = obj
+ }
+-
+-unix {
+-
+- exists( $${QMAKE_LIBDIR_QT}/libqwt.* ) {
+-
+- # On some Linux distributions the Qwt libraries are installed
+- # in the same directory as the Qt libraries. Unfortunately
+- # qmake always adds QMAKE_LIBDIR_QT at the beginning of the
+- # linker path, so that the installed libraries will be
+- # used instead of the local ones.
+-
+- error( "local build will conflict with $${QMAKE_LIBDIR_QT}/libqwt.*" )
+- }
+-}
diff --git a/package/libqwt/libqwt.mk b/package/libqwt/libqwt.mk
new file mode 100644
index 0000000..44d7eda
--- /dev/null
+++ b/package/libqwt/libqwt.mk
@@ -0,0 +1,51 @@
+#############################################################
+#
+# libqwt
+#
+#############################################################
+LIBQWT_VERSION = 6.0.1
+LIBQWT_SOURCE = qwt-$(LIBQWT_VERSION).tar.bz2
+LIBQWT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/qwt/qwt/$(LIBQWT_VERSION)/
+LIBQWT_INSTALL_STAGING = YES
+LIBQWT_DEPENDENCIES = qt
+
+LIBQWT_CONFIG = 's%QWT_INSTALL_PREFIX.*/usr/local/.*%QWT_INSTALL_PREFIX = /usr%'
+LIBQWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtDesigner.*$$/\# QWT_CONFIG += QwtDesigner/'
+LIBQWT_CONFIG += -e 's%/features%/mkspecs/features%'
+
+ifeq ($(BR2_PACKAGE_LIBQWT_SVG),y)
+ LIBQWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtSvg.*$$/QWT_CONFIG += QwtSvg/'
+else
+ LIBQWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtSvg.*$$/\# QWT_CONFIG += QwtSvg/'
+endif
+
+ifeq ($(BR2_PACKAGE_LIBQWT_MATHML),y)
+ LIBQWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtMathML.*$$/QWT_CONFIG += QwtMathML/'
+else
+ LIBQWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtMathML.*$$/\# QWT_CONFIG += QwtMathML/'
+endif
+
+define LIBQWT_CONFIGURE_CMDS
+ $(SED) $(LIBQWT_CONFIG) $(@D)/qwtconfig.pri
+ (cd $(@D); $(QT_QMAKE))
+endef
+
+define LIBQWT_BUILD_CMDS
+ $(MAKE) -C $(@D)
+endef
+
+# After installation, we fixup the INSTALL_PREFIX in qwtconfig.pri so
+# that when building with qmake, -L$(STAGING_DIR)/usr/lib is used and
+# not -L/usr/lib.
+define LIBQWT_INSTALL_STAGING_CMDS
+ $(MAKE) -C $(@D) install INSTALL_ROOT=$(STAGING_DIR)
+ $(SED) "s%QWT_INSTALL_PREFIX = .*%QWT_INSTALL_PREFIX = $(STAGING_DIR)/usr%" \
+ $(STAGING_DIR)/usr/mkspecs/features/qwtconfig.pri
+endef
+
+define LIBQWT_INSTALL_TARGET_CMDS
+ $(MAKE) -C $(@D) install INSTALL_ROOT=$(TARGET_DIR)
+ rm -Rf $(TARGET_DIR)/usr/mkspecs
+endef
+
+$(eval $(call GENTARGETS))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 39+ messages in thread* [Buildroot] [PATCH 10/10] libqwt: new package
2012-06-02 16:14 ` [Buildroot] [PATCH 10/10] libqwt: new package Thomas Petazzoni
@ 2012-09-10 9:06 ` Yegor Yefremov
2013-01-13 21:45 ` Peter Korsgaard
1 sibling, 0 replies; 39+ messages in thread
From: Yegor Yefremov @ 2012-09-10 9:06 UTC (permalink / raw)
To: buildroot
On Sat, Jun 2, 2012 at 6:14 PM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> From: Laurent GONZALEZ <br2@gezedo.com>
>
> Patch initially written by Thomas Petazzoni, then reworked and updated
> by Laurent Gonzalez, and finally cleaned up by Thomas again.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
> package/Config.in | 1 +
> package/libqwt/Config.in | 23 +++++++++
> package/libqwt/libqwt-remove-installed-check.patch | 32 ++++++++++++
> package/libqwt/libqwt.mk | 51 ++++++++++++++++++++
> 4 files changed, 107 insertions(+)
> create mode 100644 package/libqwt/Config.in
> create mode 100644 package/libqwt/libqwt-remove-installed-check.patch
> create mode 100644 package/libqwt/libqwt.mk
>
> diff --git a/package/Config.in b/package/Config.in
> index 36a2cd0..d3a1444 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -348,6 +348,7 @@ source "package/libglade/Config.in"
> source "package/gdk-pixbuf/Config.in"
> source "package/libgtk2/Config.in"
> source "package/libpng/Config.in"
> +source "package/libqwt/Config.in"
> source "package/libraw/Config.in"
> source "package/librsvg/Config.in"
> source "package/libsvgtiny/Config.in"
> diff --git a/package/libqwt/Config.in b/package/libqwt/Config.in
> new file mode 100644
> index 0000000..48b27ca
> --- /dev/null
> +++ b/package/libqwt/Config.in
> @@ -0,0 +1,23 @@
> +config BR2_PACKAGE_LIBQWT
> + bool "libqwt"
> + depends on BR2_PACKAGE_QT
> + select BR2_PACKAGE_QT_GUI_MODULE
> + help
> + Qwt is a graphics extension to the Qt GUI application
> + framework. It provides a 2D plotting widget and more.
> +
> + http://http://sourceforge.net/projects/qwt
> +
> +if BR2_PACKAGE_LIBQWT
> +
> +config BR2_PACKAGE_LIBQWT_SVG
> + bool "SVG support"
> + select BR2_PACKAGE_QT_SVG
> +
> +config BR2_PACKAGE_LIBQWT_MATHML
> + bool "MathML support"
> +
> +endif
> +
> +comment "libqwt requires qt"
> + depends on !BR2_PACKAGE_QT
> diff --git a/package/libqwt/libqwt-remove-installed-check.patch b/package/libqwt/libqwt-remove-installed-check.patch
> new file mode 100644
> index 0000000..7490a7b
> --- /dev/null
> +++ b/package/libqwt/libqwt-remove-installed-check.patch
> @@ -0,0 +1,32 @@
> +Remove useless check at build time
> +
> +At build time, Qwt looks whether the Qwt libraries are already
> +installed in the destination directory, to avoid confusion between
> +libraries installed system-wide and locally-built shared
> +libraries. However, this behaviour conflicts with how Buildroot builds
> +and installs libraries, so get rid of it.
> +
> +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> +
> +Index: qwt-6.0.0/qwtbuild.pri
> +===================================================================
> +--- qwt-6.0.0.orig/qwtbuild.pri 2011-09-12 19:37:35.663275952 +0200
> ++++ qwt-6.0.0/qwtbuild.pri 2011-09-12 19:37:41.913275949 +0200
> +@@ -53,17 +53,3 @@
> + !debug_and_release {
> + OBJECTS_DIR = obj
> + }
> +-
> +-unix {
> +-
> +- exists( $${QMAKE_LIBDIR_QT}/libqwt.* ) {
> +-
> +- # On some Linux distributions the Qwt libraries are installed
> +- # in the same directory as the Qt libraries. Unfortunately
> +- # qmake always adds QMAKE_LIBDIR_QT at the beginning of the
> +- # linker path, so that the installed libraries will be
> +- # used instead of the local ones.
> +-
> +- error( "local build will conflict with $${QMAKE_LIBDIR_QT}/libqwt.*" )
> +- }
> +-}
> diff --git a/package/libqwt/libqwt.mk b/package/libqwt/libqwt.mk
> new file mode 100644
> index 0000000..44d7eda
> --- /dev/null
> +++ b/package/libqwt/libqwt.mk
> @@ -0,0 +1,51 @@
> +#############################################################
> +#
> +# libqwt
> +#
> +#############################################################
> +LIBQWT_VERSION = 6.0.1
> +LIBQWT_SOURCE = qwt-$(LIBQWT_VERSION).tar.bz2
> +LIBQWT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/qwt/qwt/$(LIBQWT_VERSION)/
> +LIBQWT_INSTALL_STAGING = YES
> +LIBQWT_DEPENDENCIES = qt
> +
> +LIBQWT_CONFIG = 's%QWT_INSTALL_PREFIX.*/usr/local/.*%QWT_INSTALL_PREFIX = /usr%'
> +LIBQWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtDesigner.*$$/\# QWT_CONFIG += QwtDesigner/'
> +LIBQWT_CONFIG += -e 's%/features%/mkspecs/features%'
> +
> +ifeq ($(BR2_PACKAGE_LIBQWT_SVG),y)
> + LIBQWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtSvg.*$$/QWT_CONFIG += QwtSvg/'
> +else
> + LIBQWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtSvg.*$$/\# QWT_CONFIG += QwtSvg/'
> +endif
> +
> +ifeq ($(BR2_PACKAGE_LIBQWT_MATHML),y)
> + LIBQWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtMathML.*$$/QWT_CONFIG += QwtMathML/'
> +else
> + LIBQWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtMathML.*$$/\# QWT_CONFIG += QwtMathML/'
> +endif
> +
> +define LIBQWT_CONFIGURE_CMDS
> + $(SED) $(LIBQWT_CONFIG) $(@D)/qwtconfig.pri
> + (cd $(@D); $(QT_QMAKE))
> +endef
> +
> +define LIBQWT_BUILD_CMDS
> + $(MAKE) -C $(@D)
> +endef
> +
> +# After installation, we fixup the INSTALL_PREFIX in qwtconfig.pri so
> +# that when building with qmake, -L$(STAGING_DIR)/usr/lib is used and
> +# not -L/usr/lib.
> +define LIBQWT_INSTALL_STAGING_CMDS
> + $(MAKE) -C $(@D) install INSTALL_ROOT=$(STAGING_DIR)
> + $(SED) "s%QWT_INSTALL_PREFIX = .*%QWT_INSTALL_PREFIX = $(STAGING_DIR)/usr%" \
> + $(STAGING_DIR)/usr/mkspecs/features/qwtconfig.pri
> +endef
> +
> +define LIBQWT_INSTALL_TARGET_CMDS
> + $(MAKE) -C $(@D) install INSTALL_ROOT=$(TARGET_DIR)
> + rm -Rf $(TARGET_DIR)/usr/mkspecs
> +endef
> +
> +$(eval $(call GENTARGETS))
> --
> 1.7.9.5
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
ping?
^ permalink raw reply [flat|nested] 39+ messages in thread* [Buildroot] [PATCH 10/10] libqwt: new package
2012-06-02 16:14 ` [Buildroot] [PATCH 10/10] libqwt: new package Thomas Petazzoni
2012-09-10 9:06 ` Yegor Yefremov
@ 2013-01-13 21:45 ` Peter Korsgaard
1 sibling, 0 replies; 39+ messages in thread
From: Peter Korsgaard @ 2013-01-13 21:45 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> From: Laurent GONZALEZ <br2@gezedo.com>
Thomas> Patch initially written by Thomas Petazzoni, then reworked and updated
Thomas> by Laurent Gonzalez, and finally cleaned up by Thomas again.
Committed with minor fixes to match BR changes, thanks.
Thomas> diff --git a/package/libqwt/Config.in b/package/libqwt/Config.in
Thomas> new file mode 100644
Thomas> index 0000000..48b27ca
Thomas> --- /dev/null
Thomas> +++ b/package/libqwt/Config.in
Thomas> @@ -0,0 +1,23 @@
Thomas> +config BR2_PACKAGE_LIBQWT
I've dropped 'lib' and just called it BR2_PACKAGE_QWT. I've also moved
it up under qt and changed the QT_GUI_MODULE to a depends on similar to
qtuio.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 39+ messages in thread