sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

libzypp: fix mishandling of hyphenated arches 

Several hyphen-to-underscore translations were missing, causing
compiler errors trying to build arches with hyphens in their names.
This adds the missing translations.

(From OE-Core rev: 5be9785f344ec4d7580f7ec68e29dba9fceb0a0a)

(From OE-Core rev: 69f45c6e9f28aae2ba84aea87a6ed096800ed685)

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Tom Zanussi 2011-11-01 22:47:53 -05:00 committed by Richard Purdie
parent 9152ef8b1d
commit 38978dc0b8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meta/recipes-extended/libzypp/libzypp_git.bb
View File

@ -11,7 +11,7 @@ DEPENDS = "rpm boost curl libxml2 zlib sat-solver expat openssl udev"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433" SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433"
PV = "0.0-git${SRCPV}" PV = "0.0-git${SRCPV}"
PR = "r15" PR = "r16"
SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \ SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \
file://no-doc.patch \ file://no-doc.patch \
@ -98,10 +98,10 @@ do_archgen () {
esac esac
if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then
echo -n " const Arch Arch_${each_arch} " | tr - _ >> zypp/oe-arch.h echo -n " const Arch Arch_${each_arch} " | tr - _ >> zypp/oe-arch.h
echo "(_${each_arch});" >> zypp/oe-arch.h echo "(_${each_arch});" | tr - _ >> zypp/oe-arch.h
else else
echo -n " const Arch Arch_${each_arch} " | tr - _ >> zypp/oe-arch.h echo -n " const Arch Arch_${each_arch} " | tr - _ >> zypp/oe-arch.h
echo "( IdString ( \"${each_arch}\" ) );" >> zypp/oe-arch.h echo "( IdString ( \"${each_arch}\" ) );" | tr - _ >> zypp/oe-arch.h
fi fi
done done
echo "#endif /* OE_PROTO */" >> zypp/oe-arch.h echo "#endif /* OE_PROTO */" >> zypp/oe-arch.h
@ -142,7 +142,7 @@ do_archgen () {
COMPAT_WITH="${CARCH},${COMPAT} $COMPAT_WITH" COMPAT_WITH="${CARCH},${COMPAT} $COMPAT_WITH"
done done
for each_compat in ${COMPAT_WITH} ; do for each_compat in ${COMPAT_WITH} ; do
echo " defCompatibleWith( ${each_compat} );" >> zypp/oe-arch.h echo " defCompatibleWith( ${each_compat} );" | tr - _ >> zypp/oe-arch.h
done done
echo "#endif /* DEF_COMPAT */" >> zypp/oe-arch.h echo "#endif /* DEF_COMPAT */" >> zypp/oe-arch.h
echo "" >> zypp/oe-arch.h echo "" >> zypp/oe-arch.h