summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-03-28 02:41:05 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-28 09:09:16 (GMT)
commit2f2ea4a42a7b3b55345e470e454b1136c544d26f (patch)
tree05c432c2fafbe09bbda72caff9c7c2e38159c6ab /meta/recipes-extended
parent6515bea3a42a6359f9712fb9f594169d0a6906be (diff)
downloadpoky-2f2ea4a42a7b3b55345e470e454b1136c544d26f.tar.gz
zypper: Fix build with gcc 4.7
More details in patch header (From OE-Core rev: 38a18c9d52b2f0276445b3f8be7dbf464f5b64c7) 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/zypper/zypper/gcc-scope.patch20
-rw-r--r--meta/recipes-extended/zypper/zypper_git.bb3
2 files changed, 22 insertions, 1 deletions
diff --git a/meta/recipes-extended/zypper/zypper/gcc-scope.patch b/meta/recipes-extended/zypper/zypper/gcc-scope.patch
new file mode 100644
index 0000000..a35c0d9
--- /dev/null
+++ b/meta/recipes-extended/zypper/zypper/gcc-scope.patch
@@ -0,0 +1,20 @@
1Fix errors like below
2
3| /home/kraj/work/openembedded-core/build/tmp-eglibc/work/qemumips-oe-linux/zypper-1.5.3-git1+2c5bb6ceb99ecd950ef993e43d77bf0569ea0582-r1/git/src/utils/console.cc:55:8: error: '::isatty' has not been declared
4| /home/kraj/work/openembedded-core/build/tmp-eglibc/work/qemumips-oe-linux/zypper-1.5.3-git1+2c5bb6ceb99ecd950ef993e43d77bf0569ea0582-r1/git/src/utils/console.cc:55:17: error: 'STDOUT_FILENO' was not declared in this scope
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7
8Upstream-Status: Pending
9Index: git/src/utils/console.cc
10===================================================================
11--- git.orig/src/utils/console.cc 2012-03-27 19:12:06.171036356 -0700
12+++ git/src/utils/console.cc 2012-03-27 19:12:52.887038622 -0700
13@@ -15,6 +15,7 @@
14 #include <readline/readline.h>
15 #include <readline/history.h>
16 #include <cstdlib>
17+#include <unistd.h>
18
19 using namespace std;
20
diff --git a/meta/recipes-extended/zypper/zypper_git.bb b/meta/recipes-extended/zypper/zypper_git.bb
index e5963be..56ccc86 100644
--- a/meta/recipes-extended/zypper/zypper_git.bb
+++ b/meta/recipes-extended/zypper/zypper_git.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=3201406e350b39e05a82e28b5020f413" 5LIC_FILES_CHKSUM = "file://COPYING;md5=3201406e350b39e05a82e28b5020f413"
6 6
7DEPENDS = "libzypp augeas" 7DEPENDS = "libzypp augeas"
8PR = "r1" 8PR = "r2"
9SRCREV = "2c5bb6ceb99ecd950ef993e43d77bf0569ea0582" 9SRCREV = "2c5bb6ceb99ecd950ef993e43d77bf0569ea0582"
10 10
11inherit cmake 11inherit cmake
@@ -15,6 +15,7 @@ SRC_URI = "git://github.com/openSUSE/zypper.git;protocol=git \
15 file://cmake_libxml2.patch \ 15 file://cmake_libxml2.patch \
16 file://dso_linking_change_build_fix.patch \ 16 file://dso_linking_change_build_fix.patch \
17 file://rpm5-flag.patch \ 17 file://rpm5-flag.patch \
18 file://gcc-scope.patch \
18 " 19 "
19S = "${WORKDIR}/git" 20S = "${WORKDIR}/git"
20 21