mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

libzypp: Correctly handle - in package architecture names

Browse Source 
If package architectures contain - characters this needs to be mapped
to something else in (_) since its illegal in C variable names.

[YOCTO #1313 partially]

(From OE-Core rev: 4806a459880d0860b563d30d3fa8d7cde3461cc6)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2011-08-02 22:20:24 +01:00
committed by Saul Wold
parent bfb25ea462
commit bc7d40b7c4
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-extended/libzypp/libzypp_git.bb
+7 -5
View File
@@ -54,7 +54,7 @@ do_archgen () {
echo "" >> zypp/poky-arch.h echo "" >> zypp/poky-arch.h
echo "#ifndef POKY_ARCH_H" >> 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 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 "#endif /* POKY_ARCH_H */" >> zypp/poky-arch.h
echo "" >> zypp/poky-arch.h echo "" >> zypp/poky-arch.h
if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then
@@ -65,7 +65,7 @@ do_archgen () {
all | any | noarch) all | any | noarch)
continue;; continue;;
esac esac
echo " DEF_BUILTIN( ${each_arch} );" >> zypp/poky-arch.h echo " DEF_BUILTIN( ${each_arch} );" | tr - _ >> zypp/poky-arch.h
done done
echo "#endif /* DEF_BUILTIN */" >> zypp/poky-arch.h echo "#endif /* DEF_BUILTIN */" >> zypp/poky-arch.h
echo "" >> zypp/poky-arch.h echo "" >> zypp/poky-arch.h
@@ -77,7 +77,7 @@ do_archgen () {
all | any | noarch) all | any | noarch)
continue;; continue;;
esac 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 done
echo "#endif /* POKY_EXTERN_PROTO */" >> zypp/poky-arch.h echo "#endif /* POKY_EXTERN_PROTO */" >> zypp/poky-arch.h
echo "" >> zypp/poky-arch.h echo "" >> zypp/poky-arch.h
@@ -89,9 +89,11 @@ do_archgen () {
continue;; continue;;
esac esac
if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then 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 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 fi
done done
echo "#endif /* POKY_PROTO */" >> zypp/poky-arch.h echo "#endif /* POKY_PROTO */" >> zypp/poky-arch.h