aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-08-12 15:59:15 +0800
committerMartin Jansa <Martin.Jansa@gmail.com>2014-08-13 23:28:06 +0200
commit8afe9200c45110eb2166e09bdce739fa170c08cb (patch)
treeabf4a363504f9c5fbee8f2af9ad9cd70333f7f6e
parent4d7e174324d61c8da79152b67c4e8a434bd2d078 (diff)
downloadmeta-openembedded-contrib-8afe9200c45110eb2166e09bdce739fa170c08cb.tar.gz
meta-openembedded-contrib-8afe9200c45110eb2166e09bdce739fa170c08cb.tar.bz2
meta-openembedded-contrib-8afe9200c45110eb2166e09bdce739fa170c08cb.zip
curlpp: fix do_compile failed since gcc upgrade to 4.9
The deprecated test code was no longer used, so remove it to avoid compiling failure with -Werror=unused-function ... | example21.cpp:51:8: error: 'size_t {anonymous}::readData(char*, size_t, size_t)' defined but not used [-Werror=unused-function] | size_t readData(char *buffer, size_t size, size_t nitems) ... Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-networking/recipes-support/curlpp/curlpp/example21.cpp-remove-deprecated-code.patch47
-rw-r--r--meta-networking/recipes-support/curlpp/curlpp_0.7.3.bb3
2 files changed, 48 insertions, 2 deletions
diff --git a/meta-networking/recipes-support/curlpp/curlpp/example21.cpp-remove-deprecated-code.patch b/meta-networking/recipes-support/curlpp/curlpp/example21.cpp-remove-deprecated-code.patch
new file mode 100644
index 0000000000..dae583d854
--- /dev/null
+++ b/meta-networking/recipes-support/curlpp/curlpp/example21.cpp-remove-deprecated-code.patch
@@ -0,0 +1,47 @@
+example21.cpp: remove deprecated code
+
+The deprecated code was no longer used, so remove it to avoid
+compiling failure with -Werror=unused-function
+...
+| example21.cpp:51:8: error: 'size_t {anonymous}::readData(char*,
+size_t, size_t)' defined but not used [-Werror=unused-function]
+| size_t readData(char *buffer, size_t size, size_t nitems)
+...
+
+Upstream-Status: Pending
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ examples/example21.cpp | 17 -----------------
+ 1 file changed, 17 deletions(-)
+
+diff --git a/examples/example21.cpp b/examples/example21.cpp
+--- a/examples/example21.cpp
++++ b/examples/example21.cpp
+@@ -39,23 +39,6 @@
+ #include <curlpp/Options.hpp>
+ #include <curlpp/Exception.hpp>
+
+-/*
+- anonymous namespace to prevent name clash in case other examples using the same global entities
+- would be compiled in the same project
+-*/
+-namespace
+-{
+-
+-char *data = NULL;
+-
+-size_t readData(char *buffer, size_t size, size_t nitems)
+-{
+- strncpy(buffer, data, size * nitems);
+- return size * nitems;
+-}
+-
+-} // namespace
+-
+ int main(int argc, char *argv[])
+ {
+ if(argc != 3) {
+--
+1.9.1
+
diff --git a/meta-networking/recipes-support/curlpp/curlpp_0.7.3.bb b/meta-networking/recipes-support/curlpp/curlpp_0.7.3.bb
index d24c958736..48f5178b52 100644
--- a/meta-networking/recipes-support/curlpp/curlpp_0.7.3.bb
+++ b/meta-networking/recipes-support/curlpp/curlpp_0.7.3.bb
@@ -4,12 +4,11 @@ SECTION = "console/network"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PNBLACKLIST[curlpp] = "BROKEN: since gcc upgrade to 4.9, error: 'size_t {anonymous}::readData(char*, size_t, size_t)' defined but not used [-Werror=unused-function]"
-
DEPENDS = "curl boost"
DEPENDS_class-native = "curl-native"
SRC_URI = "http://curlpp.googlecode.com/files/curlpp-${PV}.tar.gz \
+ file://example21.cpp-remove-deprecated-code.patch \
"
SRC_URI[md5sum] = "ccc3d30d4b3b5d2cdbed635898c29485"