summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libproxy
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-04-20 09:14:22 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-24 15:51:37 +0100
commit7298e0c48198587d41319d0068aa3511afa6d1c5 (patch)
treee7f8f7905488bdcb2e03db4c6234935c150ca792 /meta/recipes-support/libproxy
parenta6d331ffb25ce81f7e42b18e12068413aab1358c (diff)
downloadopenembedded-core-7298e0c48198587d41319d0068aa3511afa6d1c5.tar.gz
openembedded-core-7298e0c48198587d41319d0068aa3511afa6d1c5.tar.bz2
openembedded-core-7298e0c48198587d41319d0068aa3511afa6d1c5.zip
libproxy: fix compilation with gcc 4.7
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libproxy')
-rw-r--r--meta/recipes-support/libproxy/libproxy/libproxy_fix_for_gcc4.7.patch30
-rw-r--r--meta/recipes-support/libproxy/libproxy_0.4.7.bb3
2 files changed, 32 insertions, 1 deletions
diff --git a/meta/recipes-support/libproxy/libproxy/libproxy_fix_for_gcc4.7.patch b/meta/recipes-support/libproxy/libproxy/libproxy_fix_for_gcc4.7.patch
new file mode 100644
index 0000000000..a772f09e87
--- /dev/null
+++ b/meta/recipes-support/libproxy/libproxy/libproxy_fix_for_gcc4.7.patch
@@ -0,0 +1,30 @@
+Upstream-Status: Pending
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+2012/04/20
+Fixes this issue with gcc 4.7
+
+| cd /srv/home/nitin/builds/bERROR: Function failed: do_compile (see /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/libproxy-0.4.7-r3/temp/log.do_compile.7514 for further information)
+| uild-gcc47/tmp/work/x86_64-poky-linux/libproxy-0.4.7-r3/libproxy-0.4.7/libproxy && /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/bin/x86_64-poky-linux/x86_64-poky-linux-g++ -Dlibproxy_EXPORTS -D_POSIX_C_SOURCE=1 -DLIBEXECDIR=\"/usr/libexec\" -DMM_MODULE_BUILTIN=config_sysconfig -fvisibility=hidden -m64 --sysroot=/srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86-64 -O2 -pipe -g -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden -fpermissive -O2 -g -fPIC -I/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/libproxy-0.4.7-r3/libproxy-0.4.7 -I/srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86-64/usr/include/glib-2.0 -I/srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86-64/usr/lib/glib-2.0/include -o CMakeFiles/libproxy.dir/modules/config_sysconfig.cpp.o -c /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/libproxy-0.4.7-r3/libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp
+| /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/libproxy-0.4.7-r3/libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp: In function 'bool should_use_sysconfig()':
+| /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/libproxy-0.4.7-r3/libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp:107:18: error: 'getuid' was not declared in this scope
+| make[2]: *** [libproxy/CMakeFiles/libproxy.dir/modules/config_sysconfig.cpp.o] Error 1
+| make[2]: Leaving directory `/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/libproxy-0.4.7-r3/libproxy-0.4.7'
+| make[1]: *** [libproxy/CMakeFiles/libproxy.dir/all] Error 2
+| make[1]: Leaving directory `/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/libproxy-0.4.7-r3/libproxy-0.4.7'
+| make: *** [all] Error 2
+| ERROR: oe_runmake failed
+NOTE: package libproxy-0.4.7-r3: task do_compile: Failed
+
+Index: libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp
+===================================================================
+--- libproxy-0.4.7.orig/libproxy/modules/config_sysconfig.cpp
++++ libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp
+@@ -21,6 +21,7 @@
+ #include <cstdlib>
+ #include <map>
+ #include <fstream>
++#include <unistd.h>
+
+ #include "../extension_config.hpp"
+ using namespace libproxy;
diff --git a/meta/recipes-support/libproxy/libproxy_0.4.7.bb b/meta/recipes-support/libproxy/libproxy_0.4.7.bb
index 6d998618d8..e3721a8f5b 100644
--- a/meta/recipes-support/libproxy/libproxy_0.4.7.bb
+++ b/meta/recipes-support/libproxy/libproxy_0.4.7.bb
@@ -8,10 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7d7044444a7b1b116e8783edcdb44ff4 \
DEPENDS = "gconf"
-PR = "r3"
+PR = "r4"
SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz \
file://g++-namepace.patch \
+ file://libproxy_fix_for_gcc4.7.patch \
"
SRC_URI[md5sum] = "509e03a488a61cd62bfbaf3ab6a2a7a5"