summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-03-23 15:37:50 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-23 17:47:42 (GMT)
commit0233e6b1a7f72aa392a68cd9c8a6748f59857b50 (patch)
treedf7d6604b553103ce61bfff036268cc053efe3df /meta/recipes-extended
parent0dd02a5e650efef53ab76ab6291aab375215eedd (diff)
downloadpoky-0233e6b1a7f72aa392a68cd9c8a6748f59857b50.tar.gz
libzypp: Fix buiild with gcc 4.7
it needs protype of close() before using it (From OE-Core rev: 046a236bf0e6005ccc8af7c1449a4fa2e1e9e91c) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/libzypp/libzypp/close.patch32
-rw-r--r--meta/recipes-extended/libzypp/libzypp_git.bb3
2 files changed, 34 insertions, 1 deletions
diff --git a/meta/recipes-extended/libzypp/libzypp/close.patch b/meta/recipes-extended/libzypp/libzypp/close.patch
new file mode 100644
index 0000000..0ff1825
--- /dev/null
+++ b/meta/recipes-extended/libzypp/libzypp/close.patch
@@ -0,0 +1,32 @@
1close() is used without a protype therefore we include unistd.h
2Fixes compile errors like below
3
4/home/kraj/work/openembedded-core/build/tmp-eglibc/work/qemuppc-oe-linux/libzypp-0.0-git1+15b6c52260bbc52b3d8e585e271b67e10cc7c433-r18/git/zypp/ExternalProgram.h:239:47: error: '::close' has not been declared
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7
8Upstream-Status: Pending
9Index: git/zypp/ExternalProgram.h
10===================================================================
11--- git.orig/zypp/ExternalProgram.h 2012-03-23 08:27:31.716438539 -0700
12+++ git/zypp/ExternalProgram.h 2012-03-23 08:27:54.520439367 -0700
13@@ -16,6 +16,7 @@
14 #include <map>
15 #include <string>
16 #include <vector>
17+#include <unistd.h>
18
19 #include "zypp/base/ExternalDataSource.h"
20 #include "zypp/Pathname.h"
21Index: git/zypp/base/Random.cc
22===================================================================
23--- git.orig/zypp/base/Random.cc 2012-03-23 08:31:09.732449118 -0700
24+++ git/zypp/base/Random.cc 2012-03-23 08:31:36.240450324 -0700
25@@ -3,6 +3,7 @@
26 #include <cstdio>
27 #include <iostream>
28 #include <fcntl.h>
29+#include <unistd.h>
30 #include "zypp/base/Random.h"
31
32 using namespace std;
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb
index 368cc06..78c7a6a 100644
--- a/meta/recipes-extended/libzypp/libzypp_git.bb
+++ b/meta/recipes-extended/libzypp/libzypp_git.bb
@@ -11,7 +11,7 @@ DEPENDS = "rpm boost curl libxml2 zlib sat-solver expat openssl udev"
11S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
12SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433" 12SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433"
13PV = "0.0-git${SRCPV}" 13PV = "0.0-git${SRCPV}"
14PR = "r18" 14PR = "r19"
15 15
16SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \ 16SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \
17 file://no-doc.patch \ 17 file://no-doc.patch \
@@ -22,6 +22,7 @@ SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \
22 file://libzypp-compatargs.patch \ 22 file://libzypp-compatargs.patch \
23 file://fix_for_compile_wth_gcc-4.6.0.patch \ 23 file://fix_for_compile_wth_gcc-4.6.0.patch \
24 file://hardcode-lib-fix.patch \ 24 file://hardcode-lib-fix.patch \
25 file://close.patch \
25 " 26 "
26 27
27SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch" 28SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch"