summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-03-01 13:07:22 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-04 23:18:09 +0000
commitf57ec88a7c7f50cd40ebeadb4da150ab39a6b6d9 (patch)
tree12979446bf55fc2406aa6c66717afee2b6e739e0
parentbe95558834eed0564ec00c65ac8067c7c65006c5 (diff)
downloadopenembedded-core-contrib-f57ec88a7c7f50cd40ebeadb4da150ab39a6b6d9.tar.gz
openembedded-core-contrib-f57ec88a7c7f50cd40ebeadb4da150ab39a6b6d9.tar.bz2
openembedded-core-contrib-f57ec88a7c7f50cd40ebeadb4da150ab39a6b6d9.zip
libgpg-error: correctly configure on mips64
This fixes the long-standing error: ../../libgpg-error-1.26/src/posix-lock.c:137: get_lock_object: Assertion `!"sizeof lock obj"' failed. Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-gnome/gcr/gcr_3.20.0.bb4
-rw-r--r--meta/recipes-gnome/libsecret/libsecret_0.18.5.bb5
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.14.5.bb5
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error_1.26.bb2
4 files changed, 2 insertions, 14 deletions
diff --git a/meta/recipes-gnome/gcr/gcr_3.20.0.bb b/meta/recipes-gnome/gcr/gcr_3.20.0.bb
index 20889021a5..f31abced02 100644
--- a/meta/recipes-gnome/gcr/gcr_3.20.0.bb
+++ b/meta/recipes-gnome/gcr/gcr_3.20.0.bb
@@ -36,7 +36,3 @@ ARM_INSTRUCTION_SET = "arm"
#
# This will be investigated later.
EXTRA_OECONF_append_x86-64 = " --disable-introspection --disable-gtk-doc"
-
-# Gcr-3.broken: poky/build-mips64/tmp/work/mips64-poky-linux/libgpg-error/1.19-r0/libgpg-error-1.19/src/posix-lock.c:119: get_lock_object: Assertion `!"sizeof lock obj"' failed.
-# qemu: uncaught target signal 6 (Aborted) - core dumped
-EXTRA_OECONF_append_mips64 = " --disable-introspection --disable-gtk-doc"
diff --git a/meta/recipes-gnome/libsecret/libsecret_0.18.5.bb b/meta/recipes-gnome/libsecret/libsecret_0.18.5.bb
index 77b9fd5be5..2b917ec517 100644
--- a/meta/recipes-gnome/libsecret/libsecret_0.18.5.bb
+++ b/meta/recipes-gnome/libsecret/libsecret_0.18.5.bb
@@ -18,8 +18,3 @@ ARM_INSTRUCTION_SET = "arm"
do_configure_prepend() {
rm -f ${S}/build/m4/vapigen.m4
}
-
-# Secret-1: poky/build-mips64/tmp/work/mips64-poky-linux/libgpg-error/1.19-r0/libgpg-error-1.19/src/posix-lock.c:119: get_lock_object: Assertion `!"sizeof lock obj"' failed.
-# qemu: uncaught target signal 6 (Aborted) - core dumped
-EXTRA_OECONF_append_mips64 = " --disable-introspection --disable-gtk-doc"
-
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.14.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.14.5.bb
index 5fb07da26d..1eb5b0b6e1 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.14.5.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.14.5.bb
@@ -111,8 +111,3 @@ ARM_INSTRUCTION_SET_armv6 = "arm"
ARM_INSTRUCTION_SET_armv7a = "thumb"
ARM_INSTRUCTION_SET_armv7r = "thumb"
ARM_INSTRUCTION_SET_armv7ve = "thumb"
-
-# WebKit2-4.0: ../../libgpg-error-1.21/src/posix-lock.c:119: get_lock_object: Assertion `!"sizeof lock obj"' failed.
-# qemu: uncaught target signal 6 (Aborted) - core dumped
-EXTRA_OECMAKE_append_mipsarchn32 = " -DENABLE_INTROSPECTION=OFF -DENABLE_GTKDOC=OFF"
-EXTRA_OECMAKE_append_mipsarchn64 = " -DENABLE_INTROSPECTION=OFF -DENABLE_GTKDOC=OFF"
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.26.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.26.bb
index 87c4f5185b..b9e3b0065c 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.26.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.26.bb
@@ -18,6 +18,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
SRC_URI[md5sum] = "97456709dbbcbb69354317ffe3e347cd"
SRC_URI[sha256sum] = "4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69"
+PR = "r1"
BINCONFIG = "${bindir}/gpg-error-config"
@@ -34,6 +35,7 @@ do_compile_prepend() {
arm) TUPLE=arm-unknown-linux-gnueabi ;;
armeb) TUPLE=arm-unknown-linux-gnueabi ;;
i586|i686) TUPLE=i686-pc-linux-gnu ;;
+ mips64*) TUPLE=mips64el-unknown-linux-gnuabi64 ;;
mips*el) TUPLE=mipsel-unknown-linux-gnu ;;
mips*) TUPLE=mips-unknown-linux-gnu ;;
x86_64) TUPLE=x86_64-pc-linux-gnu ;;