aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Woerner <twoerner@gmail.com>2018-05-16 13:06:31 -0400
committerArmin Kuster <akuster808@gmail.com>2018-06-14 20:02:24 -0700
commite1862e63e79a0da982b541bc79ebc328a525188e (patch)
tree6361511b29aa8c011c19e5c82f64f7d56917ac70
parentabd5934ea8a4c0d016e2f4b29770cbd406972436 (diff)
downloadmeta-openembedded-contrib-e1862e63e79a0da982b541bc79ebc328a525188e.tar.gz
meta-openembedded-contrib-e1862e63e79a0da982b541bc79ebc328a525188e.tar.bz2
meta-openembedded-contrib-e1862e63e79a0da982b541bc79ebc328a525188e.zip
openh264: fix build for 32-bit intel arch
Signed-off-by: Trevor Woerner <twoerner@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> (cherry picked from commit 4d49d3b53dcf0ab8090e33f3983662011d4c18ec) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb9
1 files changed, 4 insertions, 5 deletions
diff --git a/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb b/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb
index a7aaab3623..d77de2876b 100644
--- a/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb
+++ b/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb
@@ -3,9 +3,8 @@ decoding. It is suitable for use in real time applications such as WebRTC."
HOMEPAGE = "http://www.openh264.org/"
SECTION = "libs/multimedia"
-DEPENDS = "${@oe.utils.conditional('TARGET_ARCH', 'i386', 'nasm-native', \
- oe.utils.conditional('TARGET_ARCH', 'x86_64', 'nasm-native', \
- '', d), d)}"
+DEPENDS_x86 += "nasm-native"
+DEPENDS_x86-64 += "nasm-native"
LICENSE = "BSD-2-Clause"
LICENSE_FLAGS = "commercial"
@@ -17,14 +16,14 @@ SRC_URI[sha256sum] = "9c07c38d7de00046c9c52b12c76a2af7648b70d05bd5460c8b67f68957
COMPATIBLE_MACHINE_armv7a = "(.*)"
COMPATIBLE_MACHINE_aarch64 = "(.*)"
-COMPATIBLE_MACHINE_i386 = "(.*)"
+COMPATIBLE_MACHINE_x86 = "(.*)"
COMPATIBLE_MACHINE_x86-64 = "(.*)"
COMPATIBLE_MACHINE_mips = "(.*)"
COMPATIBLE_MACHINE_mips64 = "(.*)"
EXTRA_OEMAKE_armv7a = "ARCH=arm"
EXTRA_OEMAKE_aarch64 = "ARCH=arm64"
-EXTRA_OEMAKE_i386 = "ARCH=i386"
+EXTRA_OEMAKE_x86 = "ARCH=i386"
EXTRA_OEMAKE_x86-64 = "ARCH=x86_64"
EXTRA_OEMAKE_mips = "ARCH=mips"
EXTRA_OEMAKE_mips64 = "ARCH=mips64"