Patchwork libproxy: Fix build errors due to missing prototypes

login
register
mail settings
Submitter Khem Raj
Date March 1, 2012, 6:08 p.m.
Message ID <1330625283-14582-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/22551/
State Accepted
Commit f32b30ef4711fe602a11549f77be06a0eef2fc0d
Headers show

Comments

Khem Raj - March 1, 2012, 6:08 p.m.
g++ really does not like the missing prototypes
here we were missing close() and read() so include
unistd.h to get them

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../libproxy/libproxy/g++-namepace.patch           |   22 ++++++++++++++++++++
 meta/recipes-support/libproxy/libproxy_0.4.7.bb    |    6 +++-
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-support/libproxy/libproxy/g++-namepace.patch
Richard Purdie - March 1, 2012, 11:16 p.m.
On Thu, 2012-03-01 at 10:08 -0800, Khem Raj wrote:
> g++ really does not like the missing prototypes
> here we were missing close() and read() so include
> unistd.h to get them
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../libproxy/libproxy/g++-namepace.patch           |   22 ++++++++++++++++++++
>  meta/recipes-support/libproxy/libproxy_0.4.7.bb    |    6 +++-
>  2 files changed, 26 insertions(+), 2 deletions(-)
>  create mode 100644 meta/recipes-support/libproxy/libproxy/g++-namepace.patch

Merged to master, thanks.

Richard

Patch

diff --git a/meta/recipes-support/libproxy/libproxy/g++-namepace.patch b/meta/recipes-support/libproxy/libproxy/g++-namepace.patch
new file mode 100644
index 0000000..cb90ab7
--- /dev/null
+++ b/meta/recipes-support/libproxy/libproxy/g++-namepace.patch
@@ -0,0 +1,22 @@ 
+include unistd.h to get prototypes of close() and read()
+otherwise g++ complains
+
+libproxy/url.cpp:439:13: error: 'close' was not declared in this scope
+libproxy/url.cpp:398:37: error: 'read' was not declared in this scope
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+
+Index: libproxy-0.4.7/libproxy/url.cpp
+===================================================================
+--- libproxy-0.4.7.orig/libproxy/url.cpp	2012-03-01 09:51:11.254156247 -0800
++++ libproxy-0.4.7/libproxy/url.cpp	2012-03-01 09:56:12.058171256 -0800
+@@ -33,6 +33,7 @@
+ #include <cstdlib>    // For atoi()
+ #include <sys/stat.h> // For stat()
+ #include <algorithm> // For transform()
++#include <unistd.h> // For close(), read()
+ 
+ #ifdef WIN32
+ #include <io.h>
diff --git a/meta/recipes-support/libproxy/libproxy_0.4.7.bb b/meta/recipes-support/libproxy/libproxy_0.4.7.bb
index f31b701..2cb8ed3 100644
--- a/meta/recipes-support/libproxy/libproxy_0.4.7.bb
+++ b/meta/recipes-support/libproxy/libproxy_0.4.7.bb
@@ -8,9 +8,11 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=7d7044444a7b1b116e8783edcdb44ff4 \
 
 DEPENDS = "gconf"
 
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz"
+SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz \
+           file://g++-namepace.patch \
+          "
 
 SRC_URI[md5sum] = "509e03a488a61cd62bfbaf3ab6a2a7a5"
 SRC_URI[sha256sum] = "8fe0a58810139ba3c2e186deccf3e68adcd127aa0e972b0862b30b3dde493797"