From 2f2ea4a42a7b3b55345e470e454b1136c544d26f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 27 Mar 2012 19:41:05 -0700 Subject: zypper: Fix build with gcc 4.7 More details in patch header (From OE-Core rev: 38a18c9d52b2f0276445b3f8be7dbf464f5b64c7) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-extended/zypper/zypper/gcc-scope.patch | 20 ++++++++++++++++++++ meta/recipes-extended/zypper/zypper_git.bb | 3 ++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/zypper/zypper/gcc-scope.patch (limited to 'meta/recipes-extended/zypper') 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 0000000000..a35c0d91d3 --- /dev/null +++ b/meta/recipes-extended/zypper/zypper/gcc-scope.patch @@ -0,0 +1,20 @@ +Fix errors like below + +| /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 +| /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 + +Signed-off-by: Khem Raj + +Upstream-Status: Pending +Index: git/src/utils/console.cc +=================================================================== +--- git.orig/src/utils/console.cc 2012-03-27 19:12:06.171036356 -0700 ++++ git/src/utils/console.cc 2012-03-27 19:12:52.887038622 -0700 +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + + using namespace std; + diff --git a/meta/recipes-extended/zypper/zypper_git.bb b/meta/recipes-extended/zypper/zypper_git.bb index e5963be5b9..56ccc86221 100644 --- a/meta/recipes-extended/zypper/zypper_git.bb +++ b/meta/recipes-extended/zypper/zypper_git.bb @@ -5,7 +5,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=3201406e350b39e05a82e28b5020f413" DEPENDS = "libzypp augeas" -PR = "r1" +PR = "r2" SRCREV = "2c5bb6ceb99ecd950ef993e43d77bf0569ea0582" inherit cmake @@ -15,6 +15,7 @@ SRC_URI = "git://github.com/openSUSE/zypper.git;protocol=git \ file://cmake_libxml2.patch \ file://dso_linking_change_build_fix.patch \ file://rpm5-flag.patch \ + file://gcc-scope.patch \ " S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf