summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-07-16 21:56:11 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-18 10:18:42 +0100
commitb297c1aa4b68653b896e534357af46985ec0d7fc (patch)
tree8056c001323519bd4bb851c79e4ffa22b7239f62
parenta8ffa4a02c6408c80483b60ee76d3c98da52cf9a (diff)
downloadpoky-b297c1aa4b68653b896e534357af46985ec0d7fc.tar.gz
recipes: Enforce ARM ISA just for arm arches <= armv5
armv7+ used thumb2 ISA and it compiles fine with thumb2 issues are only when using thumb1 ISA (From OE-Core rev: c0ef8a91f671f30acd92e2734144f7ddf1acda53) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-selftest/recipes-test/aspell/aspell_0.0.0.1.bb5
-rw-r--r--meta/classes/goarch.bbclass6
-rw-r--r--meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb4
-rw-r--r--meta/recipes-gnome/gcr/gcr_3.28.0.bb4
-rw-r--r--meta/recipes-gnome/libsecret/libsecret_0.18.6.bb4
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.bb4
-rw-r--r--meta/recipes-support/aspell/aspell_0.60.6.1.bb5
7 files changed, 25 insertions, 7 deletions
diff --git a/meta-selftest/recipes-test/aspell/aspell_0.0.0.1.bb b/meta-selftest/recipes-test/aspell/aspell_0.0.0.1.bb
index 073cf5665c..922518bc39 100644
--- a/meta-selftest/recipes-test/aspell/aspell_0.0.0.1.bb
+++ b/meta-selftest/recipes-test/aspell/aspell_0.0.0.1.bb
@@ -28,5 +28,8 @@ FILES_${PN} = "${bindir}/aspell"
28FILES_libpspell = "${libdir}/libpspell.so.*" 28FILES_libpspell = "${libdir}/libpspell.so.*"
29FILES_libpspell-dev = "${libdir}/libpspell* ${bindir}/pspell-config ${includedir}/pspell" 29FILES_libpspell-dev = "${libdir}/libpspell* ${bindir}/pspell-config ${includedir}/pspell"
30 30
31ARM_INSTRUCTION_SET = "arm" 31ARM_INSTRUCTION_SET_armv4 = "arm"
32ARM_INSTRUCTION_SET_armv5 = "arm"
33ARM_INSTRUCTION_SET_armv6 = "arm"
34
32inherit autotools gettext 35inherit autotools gettext
diff --git a/meta/classes/goarch.bbclass b/meta/classes/goarch.bbclass
index bb36cc8142..b2c94faddb 100644
--- a/meta/classes/goarch.bbclass
+++ b/meta/classes/goarch.bbclass
@@ -33,7 +33,11 @@ COMPATIBLE_HOST_linux-muslx32 = "null"
33COMPATIBLE_HOST_powerpc = "null" 33COMPATIBLE_HOST_powerpc = "null"
34COMPATIBLE_HOST_powerpc64 = "null" 34COMPATIBLE_HOST_powerpc64 = "null"
35COMPATIBLE_HOST_mipsarchn32 = "null" 35COMPATIBLE_HOST_mipsarchn32 = "null"
36ARM_INSTRUCTION_SET = "arm" 36
37ARM_INSTRUCTION_SET_armv4 = "arm"
38ARM_INSTRUCTION_SET_armv5 = "arm"
39ARM_INSTRUCTION_SET_armv6 = "arm"
40
37TUNE_CCARGS_remove = "-march=mips32r2" 41TUNE_CCARGS_remove = "-march=mips32r2"
38SECURITY_CFLAGS_mipsarch = "${SECURITY_NOPIE_CFLAGS}" 42SECURITY_CFLAGS_mipsarch = "${SECURITY_NOPIE_CFLAGS}"
39SECURITY_NOPIE_CFLAGS ??= "" 43SECURITY_NOPIE_CFLAGS ??= ""
diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
index a8baca51e3..4bee3713a7 100644
--- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
+++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
@@ -36,6 +36,8 @@ do_install () {
36 install -m 0755 unsquashfs ${D}${sbindir}/ 36 install -m 0755 unsquashfs ${D}${sbindir}/
37} 37}
38 38
39ARM_INSTRUCTION_SET = "arm" 39ARM_INSTRUCTION_SET_armv4 = "arm"
40ARM_INSTRUCTION_SET_armv5 = "arm"
41ARM_INSTRUCTION_SET_armv6 = "arm"
40 42
41BBCLASSEXTEND = "native nativesdk" 43BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-gnome/gcr/gcr_3.28.0.bb b/meta/recipes-gnome/gcr/gcr_3.28.0.bb
index 6777ad2277..0796362e4b 100644
--- a/meta/recipes-gnome/gcr/gcr_3.28.0.bb
+++ b/meta/recipes-gnome/gcr/gcr_3.28.0.bb
@@ -21,7 +21,9 @@ FILES_${PN} += " \
21" 21"
22 22
23# http://errors.yoctoproject.org/Errors/Details/20229/ 23# http://errors.yoctoproject.org/Errors/Details/20229/
24ARM_INSTRUCTION_SET = "arm" 24ARM_INSTRUCTION_SET_armv4 = "arm"
25ARM_INSTRUCTION_SET_armv5 = "arm"
26ARM_INSTRUCTION_SET_armv6 = "arm"
25 27
26# These files may be out of date or missing our fixes 28# These files may be out of date or missing our fixes
27# libgcrypt.m4 in particular is calling into libgcrypt-config 29# libgcrypt.m4 in particular is calling into libgcrypt-config
diff --git a/meta/recipes-gnome/libsecret/libsecret_0.18.6.bb b/meta/recipes-gnome/libsecret/libsecret_0.18.6.bb
index cdc41e762a..518c71feb1 100644
--- a/meta/recipes-gnome/libsecret/libsecret_0.18.6.bb
+++ b/meta/recipes-gnome/libsecret/libsecret_0.18.6.bb
@@ -12,7 +12,9 @@ SRC_URI[archive.md5sum] = "c6cf132a56bd346fbf49a43abb02e5c2"
12SRC_URI[archive.sha256sum] = "5efbc890ba41a323ffe0599cd260fd12bd8eb62a04aa1bd1b2762575d253d66f" 12SRC_URI[archive.sha256sum] = "5efbc890ba41a323ffe0599cd260fd12bd8eb62a04aa1bd1b2762575d253d66f"
13 13
14# http://errors.yoctoproject.org/Errors/Details/20228/ 14# http://errors.yoctoproject.org/Errors/Details/20228/
15ARM_INSTRUCTION_SET = "arm" 15ARM_INSTRUCTION_SET_armv4 = "arm"
16ARM_INSTRUCTION_SET_armv5 = "arm"
17ARM_INSTRUCTION_SET_armv6 = "arm"
16 18
17# vapigen.m4 bundled with the tarball does not yet have our cross-compilation fixes 19# vapigen.m4 bundled with the tarball does not yet have our cross-compilation fixes
18do_configure_prepend() { 20do_configure_prepend() {
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.bb
index feafce2580..e105ea2c00 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.bb
@@ -30,7 +30,9 @@ SRC_URI[md5sum] = "1cc9e8cb027b9fd4c54f598f51002c19"
30SRC_URI[sha256sum] = "ed945daf40b124e77a685893cc025d086f638bc703183460aff49508edb3a43f" 30SRC_URI[sha256sum] = "ed945daf40b124e77a685893cc025d086f638bc703183460aff49508edb3a43f"
31 31
32# Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717 32# Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
33ARM_INSTRUCTION_SET = "arm" 33ARM_INSTRUCTION_SET_armv4 = "arm"
34ARM_INSTRUCTION_SET_armv5 = "arm"
35ARM_INSTRUCTION_SET_armv6 = "arm"
34 36
35# Should be API compatible with libav (which was a fork of ffmpeg) 37# Should be API compatible with libav (which was a fork of ffmpeg)
36# libpostproc was previously packaged from a separate recipe 38# libpostproc was previously packaged from a separate recipe
diff --git a/meta/recipes-support/aspell/aspell_0.60.6.1.bb b/meta/recipes-support/aspell/aspell_0.60.6.1.bb
index 19a7155d66..161bb5ce20 100644
--- a/meta/recipes-support/aspell/aspell_0.60.6.1.bb
+++ b/meta/recipes-support/aspell/aspell_0.60.6.1.bb
@@ -25,7 +25,10 @@ FILES_${PN} = "${bindir}/aspell"
25FILES_libpspell = "${libdir}/libpspell.so.*" 25FILES_libpspell = "${libdir}/libpspell.so.*"
26FILES_${PN}-dev += "${bindir}/pspell-config" 26FILES_${PN}-dev += "${bindir}/pspell-config"
27 27
28ARM_INSTRUCTION_SET = "arm" 28ARM_INSTRUCTION_SET_armv4 = "arm"
29ARM_INSTRUCTION_SET_armv5 = "arm"
30ARM_INSTRUCTION_SET_armv6 = "arm"
31
29inherit autotools-brokensep gettext texinfo binconfig-disabled 32inherit autotools-brokensep gettext texinfo binconfig-disabled
30 33
31BINCONFIG = "${bindir}/pspell-config" 34BINCONFIG = "${bindir}/pspell-config"