From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: openembedded-core <openembedded-core@lists.openembedded.org>
Subject: [PATCH] libzypp: Correctly handle - in package architecture names
Date: Wed, 03 Aug 2011 16:13:43 +0100 [thread overview]
Message-ID: <1312384423.2344.678.camel@rex> (raw)
If package architectures contain - characters this needs to be mapped
to something else in (_) since its illegal in C variable names.
[YOCTO #1313 partially]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb
index 6e8fe16..bb36a90 100644
--- a/meta/recipes-extended/libzypp/libzypp_git.bb
+++ b/meta/recipes-extended/libzypp/libzypp_git.bb
@@ -54,7 +54,7 @@ do_archgen () {
echo "" >> zypp/poky-arch.h
echo "#ifndef POKY_ARCH_H" >> zypp/poky-arch.h
echo "#define POKY_ARCH_H 1" >> zypp/poky-arch.h
- echo "#define Arch_machine Arch_${MACHINE_ARCH}" >> zypp/poky-arch.h
+ echo "#define Arch_machine Arch_${MACHINE_ARCH}" | tr - _ >> zypp/poky-arch.h
echo "#endif /* POKY_ARCH_H */" >> zypp/poky-arch.h
echo "" >> zypp/poky-arch.h
if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then
@@ -65,7 +65,7 @@ do_archgen () {
all | any | noarch)
continue;;
esac
- echo " DEF_BUILTIN( ${each_arch} );" >> zypp/poky-arch.h
+ echo " DEF_BUILTIN( ${each_arch} );" | tr - _ >> zypp/poky-arch.h
done
echo "#endif /* DEF_BUILTIN */" >> zypp/poky-arch.h
echo "" >> zypp/poky-arch.h
@@ -77,7 +77,7 @@ do_archgen () {
all | any | noarch)
continue;;
esac
- echo " extern const Arch Arch_${each_arch};" >> zypp/poky-arch.h
+ echo " extern const Arch Arch_${each_arch};" | tr - _ >> zypp/poky-arch.h
done
echo "#endif /* POKY_EXTERN_PROTO */" >> zypp/poky-arch.h
echo "" >> zypp/poky-arch.h
@@ -89,9 +89,11 @@ do_archgen () {
continue;;
esac
if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then
- echo " const Arch Arch_${each_arch} (_${each_arch});" >> zypp/poky-arch.h
+ echo -n " const Arch Arch_${each_arch} " | tr - _ >> zypp/poky-arch.h
+ echo "(_${each_arch});" >> zypp/poky-arch.h
else
- echo " const Arch Arch_${each_arch} ( IdString ( \"${each_arch}\" ) );" >> zypp/poky-arch.h
+ echo -n " const Arch Arch_${each_arch} " | tr - _ >> zypp/poky-arch.h
+ echo "( IdString ( \"${each_arch}\" ) );" >> zypp/poky-arch.h
fi
done
echo "#endif /* POKY_PROTO */" >> zypp/poky-arch.h
reply other threads:[~2011-08-03 15:18 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1312384423.2344.678.camel@rex \
--to=richard.purdie@linuxfoundation.org \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox