summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libproxy/libproxy/libproxy_fix_for_gcc4.7.patch
diff options
context:
space:
mode:
authorPhil Blundell <pb@pbcl.net>2014-01-13 12:41:17 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-14 11:33:55 +0000
commit90e8429de68ca288e9a6554e7d6e8ac1473334e7 (patch)
tree7632935fa39f0dfc63f31d9302dec2b5ecbd820c /meta/recipes-support/libproxy/libproxy/libproxy_fix_for_gcc4.7.patch
parenta90fb7b7329d8fdda53dc573349f1fc06b093c13 (diff)
downloadpoky-90e8429de68ca288e9a6554e7d6e8ac1473334e7.tar.gz
libproxy: Update to 0.4.11
Delete patches that have been applied upstream or are no longer necessary. Update LIC_FILES_CHKSUM to match new COPYING (whitespace changes only). (From OE-Core rev: 7c3b070b9cdd8b1d564d8900858cd31d11b20e6f) Signed-off-by: Phil Blundell <pb@pbcl.net> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libproxy/libproxy/libproxy_fix_for_gcc4.7.patch')
-rw-r--r--meta/recipes-support/libproxy/libproxy/libproxy_fix_for_gcc4.7.patch30
1 files changed, 0 insertions, 30 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
deleted file mode 100644
index a772f09e87..0000000000
--- a/meta/recipes-support/libproxy/libproxy/libproxy_fix_for_gcc4.7.patch
+++ /dev/null
@@ -1,30 +0,0 @@
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;