diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-01-31 21:07:51 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-01-31 21:08:03 +0100 |
commit | 1b336ef5804b78089db8cf9336a457563acaaa52 (patch) | |
tree | 151db6acdf798f9a945ec03c4d8341e1b55a308d | |
parent | b45e81addfc641ec103ee38a09a97ed111e9ec7f (diff) | |
download | ptxdist-1b336ef5804b78089db8cf9336a457563acaaa52.tar.gz ptxdist-1b336ef5804b78089db8cf9336a457563acaaa52.tar.xz |
xmlrpc-c: add patch to fix building with XMLRPC_C_CPLUSPLUS disabled
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
6 files changed, 34 insertions, 21 deletions
diff --git a/patches/xmlrpc-c-1.06.41/0001-configure.in-add-propper-quoting-to-AC_CHECK_-FUNC-L.patch b/patches/xmlrpc-c-1.06.41/0001-configure.in-add-propper-quoting-to-AC_CHECK_-FUNC-L.patch index d87dd11da..ec7c7c880 100644 --- a/patches/xmlrpc-c-1.06.41/0001-configure.in-add-propper-quoting-to-AC_CHECK_-FUNC-L.patch +++ b/patches/xmlrpc-c-1.06.41/0001-configure.in-add-propper-quoting-to-AC_CHECK_-FUNC-L.patch @@ -1,7 +1,6 @@ -From 478fbb086f852ed4b106d0e984f429204c55b18b Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde <mkl@pengutronix.de> Date: Wed, 3 Feb 2010 13:47:09 +0100 -Subject: [PATCH 1/4] configure.in: add propper quoting to AC_CHECK_{FUNC,LIB} +Subject: [PATCH] configure.in: add propper quoting to AC_CHECK_{FUNC,LIB} This patch fixes this problem: @@ -17,7 +16,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in -index 4cfcee1..929fa48 100644 +index 8f1f890..dfbc6a4 100644 --- a/configure.in +++ b/configure.in @@ -227,7 +227,7 @@ dnl ======================================================================= @@ -29,6 +28,3 @@ index 4cfcee1..929fa48 100644 # Above sets LIBS, which is not all that useful because we don't want # to include every library in every link. It also sets --- -1.6.6.1 - diff --git a/patches/xmlrpc-c-1.06.41/0002-Makefile.config-fix-shared-libs-on-arm.patch b/patches/xmlrpc-c-1.06.41/0002-Makefile.config-fix-shared-libs-on-arm.patch index 73be0b2d8..c24b850ae 100644 --- a/patches/xmlrpc-c-1.06.41/0002-Makefile.config-fix-shared-libs-on-arm.patch +++ b/patches/xmlrpc-c-1.06.41/0002-Makefile.config-fix-shared-libs-on-arm.patch @@ -1,7 +1,6 @@ -From a11e453f3a908d072984c464fbeafb058b3ed4f1 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde <mkl@pengutronix.de> Date: Wed, 3 Feb 2010 12:43:37 +0100 -Subject: [PATCH 2/4] Makefile.config: fix shared libs on arm +Subject: [PATCH] Makefile.config: fix shared libs on arm The magic to detect a linux system expects that "HOST_OS" == "linux-gnu". Unfortunately this is not true for modern arm system with @@ -28,6 +27,3 @@ index 07f37af..a79ca1e 100644 # Assume linker is GNU Compiler (gcc) SHARED_LIB_TYPE = unix SHLIB_SUFFIX = so --- -1.6.6.1 - diff --git a/patches/xmlrpc-c-1.06.41/0003-xmlrpc-c-config.in-use-pkg-config-to-get-curl-s-libs.patch b/patches/xmlrpc-c-1.06.41/0003-xmlrpc-c-config.in-use-pkg-config-to-get-curl-s-libs.patch index 433a47e8d..32a5d88a4 100644 --- a/patches/xmlrpc-c-1.06.41/0003-xmlrpc-c-config.in-use-pkg-config-to-get-curl-s-libs.patch +++ b/patches/xmlrpc-c-1.06.41/0003-xmlrpc-c-config.in-use-pkg-config-to-get-curl-s-libs.patch @@ -1,7 +1,6 @@ -From 1c3b0db175dbcf173c5c733662041b324c714c0e Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde <mkl@pengutronix.de> Date: Tue, 2 Feb 2010 18:57:47 +0100 -Subject: [PATCH 3/4] xmlrpc-c-config.in: use pkg-config to get curl's libs +Subject: [PATCH] xmlrpc-c-config.in: use pkg-config to get curl's libs Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- @@ -21,6 +20,3 @@ index db6afdb..2baafe9 100644 the_rpath="@CURL_RPATH@ $the_rpath" the_wl_rpath="@CURL_WL_RPATH@ $the_wl_rpath" fi --- -1.6.6.1 - diff --git a/patches/xmlrpc-c-1.06.41/0004-xmlrpc-c-config.in-add-SYSROOT-support.patch b/patches/xmlrpc-c-1.06.41/0004-xmlrpc-c-config.in-add-SYSROOT-support.patch index c2e75e167..67316c239 100644 --- a/patches/xmlrpc-c-1.06.41/0004-xmlrpc-c-config.in-add-SYSROOT-support.patch +++ b/patches/xmlrpc-c-1.06.41/0004-xmlrpc-c-config.in-add-SYSROOT-support.patch @@ -1,7 +1,6 @@ -From 1ba9eae3e631850748f0fc471abc29103ccd6188 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde <mkl@pengutronix.de> Date: Tue, 2 Feb 2010 18:59:27 +0100 -Subject: [PATCH 4/4] xmlrpc-c-config.in: add SYSROOT support +Subject: [PATCH] xmlrpc-c-config.in: add SYSROOT support Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- @@ -30,6 +29,3 @@ index 2baafe9..699f697 100644 while test $# -gt 0; do case $1 in --- -1.6.6.1 - diff --git a/patches/xmlrpc-c-1.06.41/0005-calling-AC_PROG_CXX-conditionally-is-broken-with-aut.patch b/patches/xmlrpc-c-1.06.41/0005-calling-AC_PROG_CXX-conditionally-is-broken-with-aut.patch new file mode 100644 index 000000000..48009a9ce --- /dev/null +++ b/patches/xmlrpc-c-1.06.41/0005-calling-AC_PROG_CXX-conditionally-is-broken-with-aut.patch @@ -0,0 +1,25 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Tue, 31 Jan 2012 21:04:17 +0100 +Subject: [PATCH] calling AC_PROG_CXX conditionally is broken with autoconf > + 2.52 + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + configure.in | 4 +--- + 1 files changed, 1 insertions(+), 3 deletions(-) + +diff --git a/configure.in b/configure.in +index dfbc6a4..f362127 100644 +--- a/configure.in ++++ b/configure.in +@@ -213,9 +213,7 @@ dnl Checks for programs. + dnl ======================================================================= + + AC_PROG_CC +-if test x"$enable_cplusplus" != xno; then +- AC_PROG_CXX +-fi ++AC_PROG_CXX + + + dnl ======================================================================= diff --git a/patches/xmlrpc-c-1.06.41/series b/patches/xmlrpc-c-1.06.41/series index 28326090c..353a5820d 100644 --- a/patches/xmlrpc-c-1.06.41/series +++ b/patches/xmlrpc-c-1.06.41/series @@ -1,4 +1,8 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 0001-configure.in-add-propper-quoting-to-AC_CHECK_-FUNC-L.patch 0002-Makefile.config-fix-shared-libs-on-arm.patch 0003-xmlrpc-c-config.in-use-pkg-config-to-get-curl-s-libs.patch 0004-xmlrpc-c-config.in-add-SYSROOT-support.patch +0005-calling-AC_PROG_CXX-conditionally-is-broken-with-aut.patch +# d872292dc31c12b342cd7c678a7c1c7c - git-ptx-patches magic |