diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2011-11-01 22:47:53 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-08 21:48:30 +0000 |
commit | a021dae5b74158b422b0c5eafa7e526bb2f4b3de (patch) | |
tree | f4029196f10d282d95cf831e6fa2714f18a2a336 /meta/recipes-extended/libzypp/libzypp_git.bb | |
parent | 590acd89238e43766ce8083e67a21f8bd03698d4 (diff) | |
download | poky-a021dae5b74158b422b0c5eafa7e526bb2f4b3de.tar.gz |
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)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/libzypp/libzypp_git.bb')
-rw-r--r-- | 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 20e8f7c33a..a6b270c50a 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" | |||
11 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
12 | SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433" | 12 | SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433" |
13 | PV = "0.0-git${SRCPV}" | 13 | PV = "0.0-git${SRCPV}" |
14 | PR = "r15" | 14 | PR = "r16" |
15 | 15 | ||
16 | SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \ | 16 | SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \ |
17 | file://no-doc.patch \ | 17 | file://no-doc.patch \ |
@@ -98,10 +98,10 @@ do_archgen () { | |||
98 | esac | 98 | esac |
99 | if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then | 99 | if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then |
100 | echo -n " const Arch Arch_${each_arch} " | tr - _ >> zypp/oe-arch.h | 100 | echo -n " const Arch Arch_${each_arch} " | tr - _ >> zypp/oe-arch.h |
101 | echo "(_${each_arch});" >> zypp/oe-arch.h | 101 | echo "(_${each_arch});" | tr - _ >> zypp/oe-arch.h |
102 | else | 102 | else |
103 | echo -n " const Arch Arch_${each_arch} " | tr - _ >> zypp/oe-arch.h | 103 | echo -n " const Arch Arch_${each_arch} " | tr - _ >> zypp/oe-arch.h |
104 | echo "( IdString ( \"${each_arch}\" ) );" >> zypp/oe-arch.h | 104 | echo "( IdString ( \"${each_arch}\" ) );" | tr - _ >> zypp/oe-arch.h |
105 | fi | 105 | fi |
106 | done | 106 | done |
107 | echo "#endif /* OE_PROTO */" >> zypp/oe-arch.h | 107 | echo "#endif /* OE_PROTO */" >> zypp/oe-arch.h |
@@ -142,7 +142,7 @@ do_archgen () { | |||
142 | COMPAT_WITH="${CARCH},${COMPAT} $COMPAT_WITH" | 142 | COMPAT_WITH="${CARCH},${COMPAT} $COMPAT_WITH" |
143 | done | 143 | done |
144 | for each_compat in ${COMPAT_WITH} ; do | 144 | for each_compat in ${COMPAT_WITH} ; do |
145 | echo " defCompatibleWith( ${each_compat} );" >> zypp/oe-arch.h | 145 | echo " defCompatibleWith( ${each_compat} );" | tr - _ >> zypp/oe-arch.h |
146 | done | 146 | done |
147 | echo "#endif /* DEF_COMPAT */" >> zypp/oe-arch.h | 147 | echo "#endif /* DEF_COMPAT */" >> zypp/oe-arch.h |
148 | echo "" >> zypp/oe-arch.h | 148 | echo "" >> zypp/oe-arch.h |