aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2015-10-09 17:11:29 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-12 14:33:53 +0100
commit555c2e0062bffdce43552c0de5ca74d688d7a0cf (patch)
treeccf4426970da2c86db82ff4af559e9dd70fbf166
parent3d95440b77bfe90d20c8b7a96e611b6cf2ffcb70 (diff)
downloadopenembedded-core-contrib-555c2e0062bffdce43552c0de5ca74d688d7a0cf.tar.gz
webkitgtk, gcr, libsecret: force ARM mode
* gcr, libsecret are new since switch to gcc 5.2 * webkitgtk is old but it was removed while migrating from webkit-gtk to webkitgtl (like REQUIRED_DISTRO_FEATURES were) :/ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-gnome/gcr/gcr_3.16.0.bb3
-rw-r--r--meta/recipes-gnome/libsecret/libsecret_0.18.2.bb3
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.8.5.bb2
3 files changed, 8 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gcr/gcr_3.16.0.bb b/meta/recipes-gnome/gcr/gcr_3.16.0.bb
index 8b5b6e4465..4c9fe2ec89 100644
--- a/meta/recipes-gnome/gcr/gcr_3.16.0.bb
+++ b/meta/recipes-gnome/gcr/gcr_3.16.0.bb
@@ -16,3 +16,6 @@ FILES_${PN} += " \
${datadir}/dbus-1 \
${datadir}/gcr-3 \
"
+
+# http://errors.yoctoproject.org/Errors/Details/20229/
+ARM_INSTRUCTION_SET = "arm"
diff --git a/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb b/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb
index ac84cb1a1a..8fc00181f4 100644
--- a/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb
+++ b/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb
@@ -10,3 +10,6 @@ EXTRA_OECONF += "--disable-manpages"
SRC_URI[archive.md5sum] = "23cdf8267d11a26f88f0dbec1e2022ad"
SRC_URI[archive.sha256sum] = "12fd288b012e1b2b1b54d586cd4c6507885715534644b4534b7ef7d7079ba443"
+
+# http://errors.yoctoproject.org/Errors/Details/20228/
+ARM_INSTRUCTION_SET = "arm"
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb
index f14c868b7c..e29666ae78 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb
@@ -70,3 +70,5 @@ FILES_${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbu
FILES_${PN}-dbg += "${libdir}/webkit2gtk-4.0/injected-bundle/.debug/libwebkit2gtkinjectedbundle.so"
FILES_${PN}-dbg += "${libdir}/webkitgtk/webkit2gtk-4.0/.debug/*"
+# http://errors.yoctoproject.org/Errors/Details/20370/
+ARM_INSTRUCTION_SET = "arm"