diff options
Diffstat (limited to 'meta/recipes-extended/libzypp/libzypp_git.bb')
-rw-r--r-- | meta/recipes-extended/libzypp/libzypp_git.bb | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb index b9110eb09e..825339d126 100644 --- a/meta/recipes-extended/libzypp/libzypp_git.bb +++ b/meta/recipes-extended/libzypp/libzypp_git.bb | |||
@@ -13,12 +13,15 @@ RDEPENDS_${PN} = "sat-solver" | |||
13 | 13 | ||
14 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
15 | PV = "0.0-git${SRCPV}" | 15 | PV = "0.0-git${SRCPV}" |
16 | PR = "r6" | 16 | PR = "r7" |
17 | 17 | ||
18 | SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \ | 18 | SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \ |
19 | file://no-doc.patch \ | 19 | file://no-doc.patch \ |
20 | file://rpm5.patch \ | 20 | file://rpm5.patch \ |
21 | file://rpm5-no-rpmdbinit.patch \ | 21 | file://rpm5-no-rpmdbinit.patch \ |
22 | file://builtin-arch.patch;apply=no \ | ||
23 | file://no-builtin-arch.patch;apply=no \ | ||
24 | file://archconf.patch;apply=no \ | ||
22 | " | 25 | " |
23 | 26 | ||
24 | SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch" | 27 | SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch" |
@@ -27,3 +30,26 @@ FILES_${PN} += "${libdir}/zypp ${datadir}/zypp ${datadir}/icons" | |||
27 | FILES_${PN}-dev += "${datadir}/cmake" | 30 | FILES_${PN}-dev += "${datadir}/cmake" |
28 | 31 | ||
29 | EXTRA_OECMAKE += "-DLIB=lib" | 32 | EXTRA_OECMAKE += "-DLIB=lib" |
33 | |||
34 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
35 | |||
36 | do_archpatch () { | ||
37 | PKG_ARCH_TAIL=`sed -n ${S}/zypp/Arch.cc -e "s|^.*defCompatibleWith( _${BASE_PACKAGE_ARCH},[ \t]*\(.*\) .*$|\1|p"` | ||
38 | if [ "x${PKG_ARCH_TAIL}" == x ]; then | ||
39 | PATCHFILE=${WORKDIR}/no-builtin-arch.patch | ||
40 | else | ||
41 | PATCHFILE=${WORKDIR}/builtin-arch.patch | ||
42 | fi | ||
43 | |||
44 | sed -i "${PATCHFILE}" \ | ||
45 | -e "s|@MACHINE_ARCH@|${MACHINE_ARCH}|g" \ | ||
46 | -e "s|@PKG_ARCH@|${BASE_PACKAGE_ARCH}|g" \ | ||
47 | -e "s|@PKG_ARCH_TAIL@|${PKG_ARCH_TAIL}|g" | ||
48 | |||
49 | patch -p1 -i "${PATCHFILE}" | ||
50 | |||
51 | sed -i ${WORKDIR}/archconf.patch -e "s|@MACHINE_ARCH@|${MACHINE_ARCH}|g" | ||
52 | patch -p1 -i ${WORKDIR}/archconf.patch | ||
53 | } | ||
54 | |||
55 | addtask archpatch before do_patch after do_unpack | ||