sat-solver: add machine arch support

(From OE-Core rev: ca758fa404fa447689ff205ee3b4b76bd3f1068a)

Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 26 insertions, 2 deletions

diff --git a/meta/recipes-extended/sat-solver/sat-solver_git.bb b/meta/recipes-extended/sat-solver/sat-solver_git.bb
index 02b6c75507..54420cd154 100644
--- a/meta/recipes-extended/sat-solver/sat-solver_git.bb
+++ b/meta/recipes-extended/sat-solver/sat-solver_git.bb
@@ -7,14 +7,38 @@ LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8"
 DEPENDS = "libcheck rpm zlib expat db"
 
 PV = "0.0-git${SRCPV}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "git://gitorious.org/opensuse/sat-solver.git;protocol=git \
            file://cmake.patch \
            file://rpm5.patch \
-           file://db5.patch"
+           file://db5.patch \
+           file://builtin-arch.patch;apply=no \
+           file://no-builtin-arch.patch;apply=no \
+          "
 
 S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE += "-DLIB=lib"
+
 inherit cmake pkgconfig
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+do_archpatch () {
+        PKG_ARCH_TAIL=`sed -n ${S}/src/poolarch.c -e "s|^  \"\(${BASE_PACKAGE_ARCH}\)\",.*\"\(.*\)\",.*$|\2|p"`
+        if [ "x${PKG_ARCH_TAIL}" == x ]; then
+                PATCHFILE=${WORKDIR}/no-builtin-arch.patch
+        else
+                PATCHFILE=${WORKDIR}/builtin-arch.patch
+        fi
+
+        sed -i "${PATCHFILE}" \
+                -e "s|@MACHINE_ARCH@|${MACHINE_ARCH}|g" \
+                -e "s|@PKG_ARCH@|${BASE_PACKAGE_ARCH}|g" \
+                -e "s|@PKG_ARCH_TAIL@|${PKG_ARCH_TAIL}|g"
+
+        patch -p1 -i "${PATCHFILE}"
+}
+
+addtask archpatch before do_patch after do_unpack