summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-04-20 16:14:22 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-31 20:15:09 (GMT)
commit24ffb5c0b10683cb62d02ec63a493712e613a62a (patch)
treebb83fb536572c6a70a1b532a00c9d816027accd9 /meta/recipes-support
parenta92fed4fe5513c3550ffbb8e9832e1e2b1bc14d7 (diff)
downloadpoky-24ffb5c0b10683cb62d02ec63a493712e613a62a.tar.gz
libproxy: fix compilation with gcc 4.7
(From OE-Core rev: 6689c52eb13430593d6afe48dba3973467cd2404) 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')
-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 0000000..a772f09
--- /dev/null
+++ b/meta/recipes-support/libproxy/libproxy/libproxy_fix_for_gcc4.7.patch
@@ -0,0 +1,30 @@
1Upstream-Status: Pending
2
3Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
42012/04/20
5Fixes this issue with gcc 4.7
6
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)
8| 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
9| /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()':
10| /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
11| make[2]: *** [libproxy/CMakeFiles/libproxy.dir/modules/config_sysconfig.cpp.o] Error 1
12| 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'
13| make[1]: *** [libproxy/CMakeFiles/libproxy.dir/all] Error 2
14| 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'
15| make: *** [all] Error 2
16| ERROR: oe_runmake failed
17NOTE: package libproxy-0.4.7-r3: task do_compile: Failed
18
19Index: libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp
20===================================================================
21--- libproxy-0.4.7.orig/libproxy/modules/config_sysconfig.cpp
22+++ libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp
23@@ -21,6 +21,7 @@
24 #include <cstdlib>
25 #include <map>
26 #include <fstream>
27+#include <unistd.h>
28
29 #include "../extension_config.hpp"
30 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 6d99861..e3721a8 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 \
8 8
9DEPENDS = "gconf" 9DEPENDS = "gconf"
10 10
11PR = "r3" 11PR = "r4"
12 12
13SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz \ 13SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz \
14 file://g++-namepace.patch \ 14 file://g++-namepace.patch \
15 file://libproxy_fix_for_gcc4.7.patch \
15 " 16 "
16 17
17SRC_URI[md5sum] = "509e03a488a61cd62bfbaf3ab6a2a7a5" 18SRC_URI[md5sum] = "509e03a488a61cd62bfbaf3ab6a2a7a5"