From c519aec68c61ae2a3822fde0c8e4616a97d2faaf Mon Sep 17 00:00:00 2001 From: Kevin Tian Date: Wed, 8 Sep 2010 16:57:03 +0800 Subject: libzypp: workaround to pass mips build libzypp failed due to GCC "internal compiler error: segmentation fault" error on MIPS target. The cause is about boost tribool type usage. If having assignement within conditional check as below: if ( (a = b) ) ... then gcc4.3.3 throws internal error. Then the workaround is to move assignement out of the conditional check. However I didn't find same case from web. We can come back to recheck this issue after upgrading to gcc4.5.0 for MIPS. If this issue is still there, we'll need more analysis to decide whether to report to gcc upstream or to libzypp upstream. This fixes [BUGID #277] Signed-off-by: Kevin Tian --- .../mips-workaround-gcc-tribool-error.patch | 22 ++++++++++++++++++++++ meta/recipes-extended/libzypp/libzypp_git.bb | 4 +++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/libzypp/libzypp/mips-workaround-gcc-tribool-error.patch (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/libzypp/libzypp/mips-workaround-gcc-tribool-error.patch b/meta/recipes-extended/libzypp/libzypp/mips-workaround-gcc-tribool-error.patch new file mode 100644 index 000000000..849ce3dd8 --- /dev/null +++ b/meta/recipes-extended/libzypp/libzypp/mips-workaround-gcc-tribool-error.patch @@ -0,0 +1,22 @@ +# with gcc 4.3.3 and MIPS target, gcc "internal compiler error: segmentation fault" error +# occurs when compiling Applydeltarpm.cc. I didn't find the exact reason leading to this +# error, but it should be related to how boost tribool type is interpreted by g++. So provide +# this mips workaround for now. We'll come back later to check whether it's still required after +# upgrading to 4.5.0. +# +# Signed-off-by Kevin Tian , 2010-09-08 + +diff --git a/zypp/repo/Applydeltarpm.cc b/zypp/repo/Applydeltarpm.cc +index 7b382be..0d7a1f8 100644 +--- a/zypp/repo/Applydeltarpm.cc ++++ b/zypp/repo/Applydeltarpm.cc +@@ -77,7 +77,8 @@ namespace zypp + else + { + // _last is 'indeterminate' or '!have' +- if ( (_last = have) ) ++ _last = have; ++ if ( _last ) + MIL << "Found executable " << prog << endl; + else + WAR << "No executable " << prog << endl; diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb index a2856d147..44ea60d05 100644 --- a/meta/recipes-extended/libzypp/libzypp_git.bb +++ b/meta/recipes-extended/libzypp/libzypp_git.bb @@ -10,11 +10,13 @@ DEPENDS = "rpm boost gettext curl libxml2 zlib sat-solver expat openssl udev" S = "${WORKDIR}/git" PV = "0.0-git${SRCPV}" -PR = "r0" +PR = "r1" SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \ file://no-doc.patch \ file://rpm5.patch" +SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch" + FILES_${PN} += "${libdir}/zypp ${datadir}/zypp ${datadir}/icons" FILES_${PN}-dev += "${datadir}/cmake" -- cgit v1.2.3