All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCHv2 0/3] Misc autobuilder fixes
@ 2014-12-27 16:25 Thomas Petazzoni
  2014-12-27 16:25 ` [Buildroot] [PATCHv2 1/3] libxmlrpc: bump to 1.25.30 and add hash file Thomas Petazzoni
                   ` (3 more replies)
  0 siblings, 4 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2014-12-27 16:25 UTC (permalink / raw)
  To: buildroot

Hello,

Second version of the libxmlrpc/xerces fixes. Changes since v1:

 - Drop patches that were merged.

 - Add hash file for libxmlrpc, as suggested by Yann.

Thomas

Thomas Petazzoni (3):
  libxmlrpc: bump to 1.25.30 and add hash file
  libxmlrpc: improve curl-config patch
  xerces: make sure to use the cross-compiled curl

 .../libxmlrpc/0004-use-correct-curl-config.patch   | 82 ++++++++++++++++++++--
 package/libxmlrpc/libxmlrpc.hash                   |  2 +
 package/libxmlrpc/libxmlrpc.mk                     | 11 ++-
 package/xerces/xerces.mk                           |  2 +-
 4 files changed, 90 insertions(+), 7 deletions(-)
 create mode 100644 package/libxmlrpc/libxmlrpc.hash

-- 
2.1.0

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCHv2 1/3] libxmlrpc: bump to 1.25.30 and add hash file
  2014-12-27 16:25 [Buildroot] [PATCHv2 0/3] Misc autobuilder fixes Thomas Petazzoni
@ 2014-12-27 16:25 ` Thomas Petazzoni
  2014-12-27 16:44   ` Yann E. MORIN
  2014-12-27 16:25 ` [Buildroot] [PATCHv2 2/3] libxmlrpc: improve curl-config patch Thomas Petazzoni
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 8+ messages in thread
From: Thomas Petazzoni @ 2014-12-27 16:25 UTC (permalink / raw)
  To: buildroot

This commit bumps libxmlrpc to the latest available stable version,
and adds a hash file.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libxmlrpc/libxmlrpc.hash | 2 ++
 package/libxmlrpc/libxmlrpc.mk   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 package/libxmlrpc/libxmlrpc.hash

diff --git a/package/libxmlrpc/libxmlrpc.hash b/package/libxmlrpc/libxmlrpc.hash
new file mode 100644
index 0000000..d37fcfc
--- /dev/null
+++ b/package/libxmlrpc/libxmlrpc.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 8ae6ed4ec57d50ed132b1150fc5258346eef3e291501a564f14fa97586902f98 xmlrpc-c-1.25.30.tgz
diff --git a/package/libxmlrpc/libxmlrpc.mk b/package/libxmlrpc/libxmlrpc.mk
index a8e8aa3..1b771e2 100644
--- a/package/libxmlrpc/libxmlrpc.mk
+++ b/package/libxmlrpc/libxmlrpc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBXMLRPC_VERSION = 1.25.26
+LIBXMLRPC_VERSION = 1.25.30
 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)
-- 
2.1.0

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCHv2 2/3] libxmlrpc: improve curl-config patch
  2014-12-27 16:25 [Buildroot] [PATCHv2 0/3] Misc autobuilder fixes Thomas Petazzoni
  2014-12-27 16:25 ` [Buildroot] [PATCHv2 1/3] libxmlrpc: bump to 1.25.30 and add hash file Thomas Petazzoni
@ 2014-12-27 16:25 ` Thomas Petazzoni
  2014-12-27 16:45   ` Yann E. MORIN
  2014-12-27 16:25 ` [Buildroot] [PATCHv2 3/3] xerces: make sure to use the cross-compiled curl Thomas Petazzoni
  2014-12-27 17:48 ` [Buildroot] [PATCHv2 0/3] Misc autobuilder fixes Thomas Petazzoni
  3 siblings, 1 reply; 8+ messages in thread
From: Thomas Petazzoni @ 2014-12-27 16:25 UTC (permalink / raw)
  To: buildroot

The curl-config patch that makes sure to not use curl-config from the
PATH but the curl-config program specified at configure time was
forgetting a number of other places. So we change the strategy, and
make the configure.in script define a $CURL_CONFIG variable that can
be used in Makefiles where appropriate.

This means we need to run autoconf (but not AUTORECONF = YES since the
package uses autoconf but not automake).

This fixes build failures in cases where a curl-config program is in
the PATH. Fixes:

  http://autobuild.buildroot.org/results/06b/06b7eada721483eb57adde147768a1f306b7d0d7/
  (and many similar ones)

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../libxmlrpc/0004-use-correct-curl-config.patch   | 82 ++++++++++++++++++++--
 package/libxmlrpc/libxmlrpc.mk                     |  9 ++-
 2 files changed, 86 insertions(+), 5 deletions(-)

diff --git a/package/libxmlrpc/0004-use-correct-curl-config.patch b/package/libxmlrpc/0004-use-correct-curl-config.patch
index ada0bd2..c0646d3 100644
--- a/package/libxmlrpc/0004-use-correct-curl-config.patch
+++ b/package/libxmlrpc/0004-use-correct-curl-config.patch
@@ -1,9 +1,10 @@
 Use correct curl-config program
 
-Instead of calling again curl-config in src/Makefile (which ends up
+Instead of calling directly 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.
+pointed at by the environment variables at configure time), let's
+define a CURL_CONFIG variable that contains the path to the proper
+curl-config program, and use it where appropriate.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 
@@ -16,7 +17,80 @@ Index: b/src/Makefile
    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)
++  TRANSPORT_LIBDEP += $(shell $CURL_CONFIG --libs)
  endif
  ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes)
    TRANSPORT_MODS += blddir/lib/libwww_transport/xmlrpc_libwww_transport
+Index: b/config.mk.in
+===================================================================
+--- a/config.mk.in
++++ b/config.mk.in
+@@ -32,6 +32,7 @@
+ LSOCKET = @LSOCKET@
+ WININET_LDADD = @WININET_LDADD@
+ WININET_LIBDIR = @WININET_LIBDIR@
++CURL_CONFIG = @CURL_CONFIG@
+ CURL_LDADD = @CURL_LDADD@
+ CURL_LIBDIR = @CURL_LIBDIR@
+ LIBWWW_LDADD = @LIBWWW_LDADD@
+Index: b/configure.in
+===================================================================
+--- a/configure.in
++++ b/configure.in
+@@ -550,6 +550,8 @@
+     dnl So we don't do any check now.  If we find out there's a problem with
+     dnl older Curls, we will revisit that.
+ 
++    AC_SUBST(CURL_CONFIG)
++
+     CURL_LDADD=$($CURL_CONFIG --libs)
+     AC_SUBST(CURL_LDADD)
+ 
+Index: b/lib/curl_transport/Makefile
+===================================================================
+--- a/lib/curl_transport/Makefile
++++ b/lib/curl_transport/Makefile
+@@ -29,7 +29,7 @@
+ 
+ $(SRCDIR)/common.mk: srcdir blddir
+ 
+-CURL_VERSION := $(shell curl-config --vernum)
++CURL_VERSION := $(shell $CURL_CONFIG --vernum)
+ 
+ # Some time at or before Curl 7.12, <curl/types.h> became an empty file
+ # (no-op).  Some time after Curl 7.18, <curl/types.h> ceased to exist.
+@@ -43,7 +43,7 @@
+   CFLAGS_LOCAL += -DNEED_CURL_TYPES_H
+ endif
+ 
+-CURL_INCLUDES := $(shell curl-config --cflags)
++CURL_INCLUDES := $(shell $CURL_CONFIG --cflags)
+ # We expect that curl-config --cflags just gives us -I options, because
+ # we need just the -I options for 'make dep'.  Plus, it's scary to think
+ # of what any other compiler flag would do to our compile.
+Index: b/src/cpp/test/Makefile
+===================================================================
+--- a/src/cpp/test/Makefile
++++ b/src/cpp/test/Makefile
+@@ -20,7 +20,7 @@
+ LIBS := $(shell $(XMLRPC_C_CONFIG) client --ldadd)
+ 
+ ifeq ($(MUST_BUILD_CURL_CLIENT),yes)
+-  LIBS += $(shell curl-config --libs)
++  LIBS += $(shell $CURL_CONFIG --libs)
+ endif
+ ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes)
+   LIBS += $(shell libwww-config --libs)
+Index: b/tools/common.mk
+===================================================================
+--- a/tools/common.mk
++++ b/tools/common.mk
+@@ -15,7 +15,7 @@
+   CLIENT_LDLIBS += $(shell libwww-config --libs)
+ endif
+ ifeq ($(MUST_BUILD_CURL_CLIENT),yes)
+-  CLIENT_LDLIBS += $(shell curl-config --libs)
++  CLIENT_LDLIBS += $(shell $CURL_CONFIG --libs)
+ endif
+ ifeq ($(MUST_BUILD_WININET_CLIENT),yes)
+   CLIENT_LDLIBS += $(shell wininet-config --libs)
diff --git a/package/libxmlrpc/libxmlrpc.mk b/package/libxmlrpc/libxmlrpc.mk
index 1b771e2..c3788d6 100644
--- a/package/libxmlrpc/libxmlrpc.mk
+++ b/package/libxmlrpc/libxmlrpc.mk
@@ -10,10 +10,17 @@ LIBXMLRPC_SITE = http://downloads.sourceforge.net/project/xmlrpc-c/Xmlrpc-c%20Su
 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_DEPENDENCIES = libcurl host-autoconf
 LIBXMLRPC_CONFIG_SCRIPTS = xmlrpc-c-config
 LIBXMLRPC_MAKE = $(MAKE1)
 
+# Using autoconf, not automake, so we cannot use AUTORECONF = YES.
+define LIBXMLRPC_RUN_AUTOCONF
+       cd $(@D); $(HOST_DIR)/usr/bin/autoconf
+endef
+
+LIBXMLRPC_PRE_CONFIGURE_HOOKS += LIBXMLRPC_RUN_AUTOCONF
+
 LIBXMLRPC_CONF_OPTS = \
 	$(if $(BR2_USE_WCHAR),,ac_cv_header_wchar_h=no) \
 	$(if $(BR2_INSTALL_LIBSTDCPP),,--disable-cplusplus) \
-- 
2.1.0

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCHv2 3/3] xerces: make sure to use the cross-compiled curl
  2014-12-27 16:25 [Buildroot] [PATCHv2 0/3] Misc autobuilder fixes Thomas Petazzoni
  2014-12-27 16:25 ` [Buildroot] [PATCHv2 1/3] libxmlrpc: bump to 1.25.30 and add hash file Thomas Petazzoni
  2014-12-27 16:25 ` [Buildroot] [PATCHv2 2/3] libxmlrpc: improve curl-config patch Thomas Petazzoni
@ 2014-12-27 16:25 ` Thomas Petazzoni
  2014-12-27 16:45   ` Yann E. MORIN
  2014-12-27 17:48 ` [Buildroot] [PATCHv2 0/3] Misc autobuilder fixes Thomas Petazzoni
  3 siblings, 1 reply; 8+ messages in thread
From: Thomas Petazzoni @ 2014-12-27 16:25 UTC (permalink / raw)
  To: buildroot

When curl support is enabled in xerces, and a host curl is available
on the system, it might try to use it, so this patch adds --with-curl=
to the configure options to explicitly indicate where is the curl
library to use.

Should fix:

  http://autobuild.buildroot.org/results/c3c/c3c6be45d0f764fb931a46dbf1509ccf2916ecbf/

  (We were not able to reproduce specifically this problem, but
  another similar problem, where curl was detected, but considered as
  non-working because of the compilation failure of a test program.)

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/xerces/xerces.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk
index 36955e3..9b2bb81 100644
--- a/package/xerces/xerces.mk
+++ b/package/xerces/xerces.mk
@@ -20,7 +20,7 @@ XERCES_DEPENDENCIES += libiconv
 endif
 
 ifeq ($(BR2_PACKAGE_LIBCURL),y)
-XERCES_CONF_OPTS += --enable-netaccessor-curl
+XERCES_CONF_OPTS += --enable-netaccessor-curl --with-curl=$(STAGING_DIR)/usr/lib
 XERCES_DEPENDENCIES += libcurl
 else
 XERCES_CONF_OPTS += --disable-network
-- 
2.1.0

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCHv2 1/3] libxmlrpc: bump to 1.25.30 and add hash file
  2014-12-27 16:25 ` [Buildroot] [PATCHv2 1/3] libxmlrpc: bump to 1.25.30 and add hash file Thomas Petazzoni
@ 2014-12-27 16:44   ` Yann E. MORIN
  0 siblings, 0 replies; 8+ messages in thread
From: Yann E. MORIN @ 2014-12-27 16:44 UTC (permalink / raw)
  To: buildroot

Thomas, All,

On 2014-12-27 17:25 +0100, Thomas Petazzoni spake thusly:
> This commit bumps libxmlrpc to the latest available stable version,
> and adds a hash file.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Hash manually verified to be OK.

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  package/libxmlrpc/libxmlrpc.hash | 2 ++
>  package/libxmlrpc/libxmlrpc.mk   | 2 +-
>  2 files changed, 3 insertions(+), 1 deletion(-)
>  create mode 100644 package/libxmlrpc/libxmlrpc.hash
> 
> diff --git a/package/libxmlrpc/libxmlrpc.hash b/package/libxmlrpc/libxmlrpc.hash
> new file mode 100644
> index 0000000..d37fcfc
> --- /dev/null
> +++ b/package/libxmlrpc/libxmlrpc.hash
> @@ -0,0 +1,2 @@
> +# Locally computed
> +sha256 8ae6ed4ec57d50ed132b1150fc5258346eef3e291501a564f14fa97586902f98 xmlrpc-c-1.25.30.tgz
> diff --git a/package/libxmlrpc/libxmlrpc.mk b/package/libxmlrpc/libxmlrpc.mk
> index a8e8aa3..1b771e2 100644
> --- a/package/libxmlrpc/libxmlrpc.mk
> +++ b/package/libxmlrpc/libxmlrpc.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -LIBXMLRPC_VERSION = 1.25.26
> +LIBXMLRPC_VERSION = 1.25.30
>  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)
> -- 
> 2.1.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20141227/2c30368e/attachment.asc>

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCHv2 2/3] libxmlrpc: improve curl-config patch
  2014-12-27 16:25 ` [Buildroot] [PATCHv2 2/3] libxmlrpc: improve curl-config patch Thomas Petazzoni
@ 2014-12-27 16:45   ` Yann E. MORIN
  0 siblings, 0 replies; 8+ messages in thread
From: Yann E. MORIN @ 2014-12-27 16:45 UTC (permalink / raw)
  To: buildroot

Thomas, All,

On 2014-12-27 17:25 +0100, Thomas Petazzoni spake thusly:
> The curl-config patch that makes sure to not use curl-config from the
> PATH but the curl-config program specified at configure time was
> forgetting a number of other places. So we change the strategy, and
> make the configure.in script define a $CURL_CONFIG variable that can
> be used in Makefiles where appropriate.
> 
> This means we need to run autoconf (but not AUTORECONF = YES since the
> package uses autoconf but not automake).
> 
> This fixes build failures in cases where a curl-config program is in
> the PATH. Fixes:
> 
>   http://autobuild.buildroot.org/results/06b/06b7eada721483eb57adde147768a1f306b7d0d7/
>   (and many similar ones)
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
[tested against one of the autobuild failures, although I was not able
to reproduce it beforehand]
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  .../libxmlrpc/0004-use-correct-curl-config.patch   | 82 ++++++++++++++++++++--
>  package/libxmlrpc/libxmlrpc.mk                     |  9 ++-
>  2 files changed, 86 insertions(+), 5 deletions(-)
> 
> diff --git a/package/libxmlrpc/0004-use-correct-curl-config.patch b/package/libxmlrpc/0004-use-correct-curl-config.patch
> index ada0bd2..c0646d3 100644
> --- a/package/libxmlrpc/0004-use-correct-curl-config.patch
> +++ b/package/libxmlrpc/0004-use-correct-curl-config.patch
> @@ -1,9 +1,10 @@
>  Use correct curl-config program
>  
> -Instead of calling again curl-config in src/Makefile (which ends up
> +Instead of calling directly 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.
> +pointed at by the environment variables at configure time), let's
> +define a CURL_CONFIG variable that contains the path to the proper
> +curl-config program, and use it where appropriate.
>  
>  Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>  
> @@ -16,7 +17,80 @@ Index: b/src/Makefile
>     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)
> ++  TRANSPORT_LIBDEP += $(shell $CURL_CONFIG --libs)
>   endif
>   ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes)
>     TRANSPORT_MODS += blddir/lib/libwww_transport/xmlrpc_libwww_transport
> +Index: b/config.mk.in
> +===================================================================
> +--- a/config.mk.in
> ++++ b/config.mk.in
> +@@ -32,6 +32,7 @@
> + LSOCKET = @LSOCKET@
> + WININET_LDADD = @WININET_LDADD@
> + WININET_LIBDIR = @WININET_LIBDIR@
> ++CURL_CONFIG = @CURL_CONFIG@
> + CURL_LDADD = @CURL_LDADD@
> + CURL_LIBDIR = @CURL_LIBDIR@
> + LIBWWW_LDADD = @LIBWWW_LDADD@
> +Index: b/configure.in
> +===================================================================
> +--- a/configure.in
> ++++ b/configure.in
> +@@ -550,6 +550,8 @@
> +     dnl So we don't do any check now.  If we find out there's a problem with
> +     dnl older Curls, we will revisit that.
> + 
> ++    AC_SUBST(CURL_CONFIG)
> ++
> +     CURL_LDADD=$($CURL_CONFIG --libs)
> +     AC_SUBST(CURL_LDADD)
> + 
> +Index: b/lib/curl_transport/Makefile
> +===================================================================
> +--- a/lib/curl_transport/Makefile
> ++++ b/lib/curl_transport/Makefile
> +@@ -29,7 +29,7 @@
> + 
> + $(SRCDIR)/common.mk: srcdir blddir
> + 
> +-CURL_VERSION := $(shell curl-config --vernum)
> ++CURL_VERSION := $(shell $CURL_CONFIG --vernum)
> + 
> + # Some time at or before Curl 7.12, <curl/types.h> became an empty file
> + # (no-op).  Some time after Curl 7.18, <curl/types.h> ceased to exist.
> +@@ -43,7 +43,7 @@
> +   CFLAGS_LOCAL += -DNEED_CURL_TYPES_H
> + endif
> + 
> +-CURL_INCLUDES := $(shell curl-config --cflags)
> ++CURL_INCLUDES := $(shell $CURL_CONFIG --cflags)
> + # We expect that curl-config --cflags just gives us -I options, because
> + # we need just the -I options for 'make dep'.  Plus, it's scary to think
> + # of what any other compiler flag would do to our compile.
> +Index: b/src/cpp/test/Makefile
> +===================================================================
> +--- a/src/cpp/test/Makefile
> ++++ b/src/cpp/test/Makefile
> +@@ -20,7 +20,7 @@
> + LIBS := $(shell $(XMLRPC_C_CONFIG) client --ldadd)
> + 
> + ifeq ($(MUST_BUILD_CURL_CLIENT),yes)
> +-  LIBS += $(shell curl-config --libs)
> ++  LIBS += $(shell $CURL_CONFIG --libs)
> + endif
> + ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes)
> +   LIBS += $(shell libwww-config --libs)
> +Index: b/tools/common.mk
> +===================================================================
> +--- a/tools/common.mk
> ++++ b/tools/common.mk
> +@@ -15,7 +15,7 @@
> +   CLIENT_LDLIBS += $(shell libwww-config --libs)
> + endif
> + ifeq ($(MUST_BUILD_CURL_CLIENT),yes)
> +-  CLIENT_LDLIBS += $(shell curl-config --libs)
> ++  CLIENT_LDLIBS += $(shell $CURL_CONFIG --libs)
> + endif
> + ifeq ($(MUST_BUILD_WININET_CLIENT),yes)
> +   CLIENT_LDLIBS += $(shell wininet-config --libs)
> diff --git a/package/libxmlrpc/libxmlrpc.mk b/package/libxmlrpc/libxmlrpc.mk
> index 1b771e2..c3788d6 100644
> --- a/package/libxmlrpc/libxmlrpc.mk
> +++ b/package/libxmlrpc/libxmlrpc.mk
> @@ -10,10 +10,17 @@ LIBXMLRPC_SITE = http://downloads.sourceforge.net/project/xmlrpc-c/Xmlrpc-c%20Su
>  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_DEPENDENCIES = libcurl host-autoconf
>  LIBXMLRPC_CONFIG_SCRIPTS = xmlrpc-c-config
>  LIBXMLRPC_MAKE = $(MAKE1)
>  
> +# Using autoconf, not automake, so we cannot use AUTORECONF = YES.
> +define LIBXMLRPC_RUN_AUTOCONF
> +       cd $(@D); $(HOST_DIR)/usr/bin/autoconf
> +endef
> +
> +LIBXMLRPC_PRE_CONFIGURE_HOOKS += LIBXMLRPC_RUN_AUTOCONF
> +
>  LIBXMLRPC_CONF_OPTS = \
>  	$(if $(BR2_USE_WCHAR),,ac_cv_header_wchar_h=no) \
>  	$(if $(BR2_INSTALL_LIBSTDCPP),,--disable-cplusplus) \
> -- 
> 2.1.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCHv2 3/3] xerces: make sure to use the cross-compiled curl
  2014-12-27 16:25 ` [Buildroot] [PATCHv2 3/3] xerces: make sure to use the cross-compiled curl Thomas Petazzoni
@ 2014-12-27 16:45   ` Yann E. MORIN
  0 siblings, 0 replies; 8+ messages in thread
From: Yann E. MORIN @ 2014-12-27 16:45 UTC (permalink / raw)
  To: buildroot

Thomas, All,

On 2014-12-27 17:25 +0100, Thomas Petazzoni spake thusly:
> When curl support is enabled in xerces, and a host curl is available
> on the system, it might try to use it, so this patch adds --with-curl=
> to the configure options to explicitly indicate where is the curl
> library to use.
> 
> Should fix:
> 
>   http://autobuild.buildroot.org/results/c3c/c3c6be45d0f764fb931a46dbf1509ccf2916ecbf/
> 
>   (We were not able to reproduce specifically this problem, but
>   another similar problem, where curl was detected, but considered as
>   non-working because of the compilation failure of a test program.)
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  package/xerces/xerces.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk
> index 36955e3..9b2bb81 100644
> --- a/package/xerces/xerces.mk
> +++ b/package/xerces/xerces.mk
> @@ -20,7 +20,7 @@ XERCES_DEPENDENCIES += libiconv
>  endif
>  
>  ifeq ($(BR2_PACKAGE_LIBCURL),y)
> -XERCES_CONF_OPTS += --enable-netaccessor-curl
> +XERCES_CONF_OPTS += --enable-netaccessor-curl --with-curl=$(STAGING_DIR)/usr/lib
>  XERCES_DEPENDENCIES += libcurl
>  else
>  XERCES_CONF_OPTS += --disable-network
> -- 
> 2.1.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCHv2 0/3] Misc autobuilder fixes
  2014-12-27 16:25 [Buildroot] [PATCHv2 0/3] Misc autobuilder fixes Thomas Petazzoni
                   ` (2 preceding siblings ...)
  2014-12-27 16:25 ` [Buildroot] [PATCHv2 3/3] xerces: make sure to use the cross-compiled curl Thomas Petazzoni
@ 2014-12-27 17:48 ` Thomas Petazzoni
  3 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2014-12-27 17:48 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 27 Dec 2014 17:25:53 +0100, Thomas Petazzoni wrote:

> Thomas Petazzoni (3):
>   libxmlrpc: bump to 1.25.30 and add hash file
>   libxmlrpc: improve curl-config patch
>   xerces: make sure to use the cross-compiled curl

Patches applied. Thanks Yann for the review/acks.

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

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2014-12-27 17:48 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-27 16:25 [Buildroot] [PATCHv2 0/3] Misc autobuilder fixes Thomas Petazzoni
2014-12-27 16:25 ` [Buildroot] [PATCHv2 1/3] libxmlrpc: bump to 1.25.30 and add hash file Thomas Petazzoni
2014-12-27 16:44   ` Yann E. MORIN
2014-12-27 16:25 ` [Buildroot] [PATCHv2 2/3] libxmlrpc: improve curl-config patch Thomas Petazzoni
2014-12-27 16:45   ` Yann E. MORIN
2014-12-27 16:25 ` [Buildroot] [PATCHv2 3/3] xerces: make sure to use the cross-compiled curl Thomas Petazzoni
2014-12-27 16:45   ` Yann E. MORIN
2014-12-27 17:48 ` [Buildroot] [PATCHv2 0/3] Misc autobuilder fixes Thomas Petazzoni

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.