diff options
Diffstat (limited to 'meta/recipes-extended/libzypp/libzypp_git.bb')
| -rw-r--r-- | meta/recipes-extended/libzypp/libzypp_git.bb | 69 |
1 files changed, 35 insertions, 34 deletions
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb index bb36a9069e..1fc6809a35 100644 --- a/meta/recipes-extended/libzypp/libzypp_git.bb +++ b/meta/recipes-extended/libzypp/libzypp_git.bb @@ -14,16 +14,17 @@ RDEPENDS_${PN} = "sat-solver" S = "${WORKDIR}/git" SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433" PV = "0.0-git${SRCPV}" -PR = "r12" +PR = "r13" SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \ file://no-doc.patch \ file://rpm5.patch \ file://rpm5-no-rpmdbinit.patch \ file://config-release.patch \ - file://libzypp-pokyarch.patch \ + file://libzypp-oearch.patch \ + file://libzypp-compatargs.patch \ file://fix_for_compile_wth_gcc-4.6.0.patch \ - file://hardcode-lib-fix.patch \ + file://hardcode-lib-fix.patch \ " SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch" @@ -49,57 +50,57 @@ AVOID_CONSTRUCTOR_mips = "true" do_archgen () { # We need to dynamically generate our arch file based on the machine # configuration - echo "/* Automatically generated by the libzypp recipes */" > zypp/poky-arch.h - echo "/* Avoid Constructor: ${AVOID_CONSTRUCTOR} */" >> zypp/poky-arch.h - 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}" | tr - _ >> zypp/poky-arch.h - echo "#endif /* POKY_ARCH_H */" >> zypp/poky-arch.h - echo "" >> zypp/poky-arch.h + echo "/* Automatically generated by the libzypp recipes */" > zypp/oe-arch.h + echo "/* Avoid Constructor: ${AVOID_CONSTRUCTOR} */" >> zypp/oe-arch.h + echo "" >> zypp/oe-arch.h + echo "#ifndef OE_ARCH_H" >> zypp/oe-arch.h + echo "#define OE_ARCH_H 1" >> zypp/oe-arch.h + echo "#define Arch_machine Arch_${MACHINE_ARCH}" | tr - _ >> zypp/oe-arch.h + echo "#endif /* OE_ARCH_H */" >> zypp/oe-arch.h + echo "" >> zypp/oe-arch.h if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then - echo "#ifdef DEF_BUILTIN" >> zypp/poky-arch.h - echo "/* Specify builtin types */" >> zypp/poky-arch.h + echo "#ifdef DEF_BUILTIN" >> zypp/oe-arch.h + echo "/* Specify builtin types */" >> zypp/oe-arch.h for each_arch in ${PACKAGE_ARCHS} ; do case "$each_arch" in all | any | noarch) continue;; esac - echo " DEF_BUILTIN( ${each_arch} );" | tr - _ >> zypp/poky-arch.h + echo " DEF_BUILTIN( ${each_arch} );" | tr - _ >> zypp/oe-arch.h done - echo "#endif /* DEF_BUILTIN */" >> zypp/poky-arch.h - echo "" >> zypp/poky-arch.h + echo "#endif /* DEF_BUILTIN */" >> zypp/oe-arch.h + echo "" >> zypp/oe-arch.h fi - echo "#ifdef POKY_EXTERN_PROTO" >> zypp/poky-arch.h - echo "/* Specify extern prototypes */" >> zypp/poky-arch.h + echo "#ifdef OE_EXTERN_PROTO" >> zypp/oe-arch.h + echo "/* Specify extern prototypes */" >> zypp/oe-arch.h for each_arch in ${PACKAGE_ARCHS} ; do case "$each_arch" in all | any | noarch) continue;; esac - echo " extern const Arch Arch_${each_arch};" | tr - _ >> zypp/poky-arch.h + echo " extern const Arch Arch_${each_arch};" | tr - _ >> zypp/oe-arch.h done - echo "#endif /* POKY_EXTERN_PROTO */" >> zypp/poky-arch.h - echo "" >> zypp/poky-arch.h - echo "#ifdef POKY_PROTO" >> zypp/poky-arch.h - echo "/* Specify prototypes */" >> zypp/poky-arch.h + echo "#endif /* OE_EXTERN_PROTO */" >> zypp/oe-arch.h + echo "" >> zypp/oe-arch.h + echo "#ifdef OE_PROTO" >> zypp/oe-arch.h + echo "/* Specify prototypes */" >> zypp/oe-arch.h for each_arch in ${PACKAGE_ARCHS} ; do case "$each_arch" in all | any | noarch) continue;; esac if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then - echo -n " const Arch Arch_${each_arch} " | tr - _ >> zypp/poky-arch.h - echo "(_${each_arch});" >> zypp/poky-arch.h + echo -n " const Arch Arch_${each_arch} " | tr - _ >> zypp/oe-arch.h + echo "(_${each_arch});" >> zypp/oe-arch.h else - echo -n " const Arch Arch_${each_arch} " | tr - _ >> zypp/poky-arch.h - echo "( IdString ( \"${each_arch}\" ) );" >> zypp/poky-arch.h + echo -n " const Arch Arch_${each_arch} " | tr - _ >> zypp/oe-arch.h + echo "( IdString ( \"${each_arch}\" ) );" >> zypp/oe-arch.h fi done - echo "#endif /* POKY_PROTO */" >> zypp/poky-arch.h - echo "" >> zypp/poky-arch.h - echo "#ifdef POKY_DEF_COMPAT" >> zypp/poky-arch.h - echo "/* Specify compatibility information */" >> zypp/poky-arch.h + echo "#endif /* OE_PROTO */" >> zypp/oe-arch.h + echo "" >> zypp/oe-arch.h + echo "#ifdef OE_DEF_COMPAT" >> zypp/oe-arch.h + echo "/* Specify compatibility information */" >> zypp/oe-arch.h INSTALL_PLATFORM_ARCHS="" for each_arch in ${PACKAGE_ARCHS} ; do INSTALL_PLATFORM_ARCHS="$each_arch $INSTALL_PLATFORM_ARCHS" @@ -134,10 +135,10 @@ do_archgen () { COMPAT_WITH="${CARCH},${COMPAT} $COMPAT_WITH" done for each_compat in ${COMPAT_WITH} ; do - echo " defCompatibleWith( ${each_compat} );" >> zypp/poky-arch.h + echo " defCompatibleWith( ${each_compat} );" >> zypp/oe-arch.h done - echo "#endif /* DEF_COMPAT */" >> zypp/poky-arch.h - echo "" >> zypp/poky-arch.h + echo "#endif /* DEF_COMPAT */" >> zypp/oe-arch.h + echo "" >> zypp/oe-arch.h } addtask archgen before do_configure after do_patch |