diff options
Diffstat (limited to 'meta/recipes-extended/libzypp')
| -rw-r--r-- | meta/recipes-extended/libzypp/libzypp_git.bb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb index 6e8fe16a15..bb36a9069e 100644 --- a/meta/recipes-extended/libzypp/libzypp_git.bb +++ b/meta/recipes-extended/libzypp/libzypp_git.bb | |||
| @@ -54,7 +54,7 @@ do_archgen () { | |||
| 54 | echo "" >> zypp/poky-arch.h | 54 | echo "" >> zypp/poky-arch.h |
| 55 | echo "#ifndef POKY_ARCH_H" >> zypp/poky-arch.h | 55 | echo "#ifndef POKY_ARCH_H" >> zypp/poky-arch.h |
| 56 | echo "#define POKY_ARCH_H 1" >> zypp/poky-arch.h | 56 | echo "#define POKY_ARCH_H 1" >> zypp/poky-arch.h |
| 57 | echo "#define Arch_machine Arch_${MACHINE_ARCH}" >> zypp/poky-arch.h | 57 | echo "#define Arch_machine Arch_${MACHINE_ARCH}" | tr - _ >> zypp/poky-arch.h |
| 58 | echo "#endif /* POKY_ARCH_H */" >> zypp/poky-arch.h | 58 | echo "#endif /* POKY_ARCH_H */" >> zypp/poky-arch.h |
| 59 | echo "" >> zypp/poky-arch.h | 59 | echo "" >> zypp/poky-arch.h |
| 60 | if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then | 60 | if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then |
| @@ -65,7 +65,7 @@ do_archgen () { | |||
| 65 | all | any | noarch) | 65 | all | any | noarch) |
| 66 | continue;; | 66 | continue;; |
| 67 | esac | 67 | esac |
| 68 | echo " DEF_BUILTIN( ${each_arch} );" >> zypp/poky-arch.h | 68 | echo " DEF_BUILTIN( ${each_arch} );" | tr - _ >> zypp/poky-arch.h |
| 69 | done | 69 | done |
| 70 | echo "#endif /* DEF_BUILTIN */" >> zypp/poky-arch.h | 70 | echo "#endif /* DEF_BUILTIN */" >> zypp/poky-arch.h |
| 71 | echo "" >> zypp/poky-arch.h | 71 | echo "" >> zypp/poky-arch.h |
| @@ -77,7 +77,7 @@ do_archgen () { | |||
| 77 | all | any | noarch) | 77 | all | any | noarch) |
| 78 | continue;; | 78 | continue;; |
| 79 | esac | 79 | esac |
| 80 | echo " extern const Arch Arch_${each_arch};" >> zypp/poky-arch.h | 80 | echo " extern const Arch Arch_${each_arch};" | tr - _ >> zypp/poky-arch.h |
| 81 | done | 81 | done |
| 82 | echo "#endif /* POKY_EXTERN_PROTO */" >> zypp/poky-arch.h | 82 | echo "#endif /* POKY_EXTERN_PROTO */" >> zypp/poky-arch.h |
| 83 | echo "" >> zypp/poky-arch.h | 83 | echo "" >> zypp/poky-arch.h |
| @@ -89,9 +89,11 @@ do_archgen () { | |||
| 89 | continue;; | 89 | continue;; |
| 90 | esac | 90 | esac |
| 91 | if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then | 91 | if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then |
| 92 | echo " const Arch Arch_${each_arch} (_${each_arch});" >> zypp/poky-arch.h | 92 | echo -n " const Arch Arch_${each_arch} " | tr - _ >> zypp/poky-arch.h |
| 93 | echo "(_${each_arch});" >> zypp/poky-arch.h | ||
| 93 | else | 94 | else |
| 94 | echo " const Arch Arch_${each_arch} ( IdString ( \"${each_arch}\" ) );" >> zypp/poky-arch.h | 95 | echo -n " const Arch Arch_${each_arch} " | tr - _ >> zypp/poky-arch.h |
| 96 | echo "( IdString ( \"${each_arch}\" ) );" >> zypp/poky-arch.h | ||
| 95 | fi | 97 | fi |
| 96 | done | 98 | done |
| 97 | echo "#endif /* POKY_PROTO */" >> zypp/poky-arch.h | 99 | echo "#endif /* POKY_PROTO */" >> zypp/poky-arch.h |