[oe-commits] Tom Zanussi : libzypp: fix mishandling of hyphenated arches
git at git.openembedded.org
git at git.openembedded.org
Wed Nov 9 14:57:45 UTC 2011
Module: openembedded-core.git
Branch: master-next
Commit: 5be9785f344ec4d7580f7ec68e29dba9fceb0a0a
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=5be9785f344ec4d7580f7ec68e29dba9fceb0a0a
Author: Tom Zanussi <tom.zanussi at intel.com>
Date: Tue Nov 1 22:47:53 2011 -0500
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.
Signed-off-by: Tom Zanussi <tom.zanussi at intel.com>
---
meta/recipes-extended/libzypp/libzypp_git.bb | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb
index 20e8f7c..a6b270c 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"
S = "${WORKDIR}/git"
SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433"
PV = "0.0-git${SRCPV}"
-PR = "r15"
+PR = "r16"
SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \
file://no-doc.patch \
@@ -98,10 +98,10 @@ do_archgen () {
esac
if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then
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
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
done
echo "#endif /* OE_PROTO */" >> zypp/oe-arch.h
@@ -142,7 +142,7 @@ do_archgen () {
COMPAT_WITH="${CARCH},${COMPAT} $COMPAT_WITH"
done
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
echo "#endif /* DEF_COMPAT */" >> zypp/oe-arch.h
echo "" >> zypp/oe-arch.h
More information about the Openembedded-commits
mailing list