summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Woerner <twoerner@gmail.com>2018-05-16 13:06:31 -0400
committerArmin Kuster <akuster808@gmail.com>2018-05-17 08:31:12 -0700
commit4d49d3b53dcf0ab8090e33f3983662011d4c18ec (patch)
treef75bc32c4ab4c2899f8512ec2aa87dfccc6dd37f
parent973aec3a2ad1114ddf243bfef08e57847a85e142 (diff)
downloadmeta-openembedded-4d49d3b53dcf0ab8090e33f3983662011d4c18ec.tar.gz
openh264: fix build for 32-bit intel arch
Signed-off-by: Trevor Woerner <twoerner@gmail.com> 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 a7aaab362..d77de2876 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."
3HOMEPAGE = "http://www.openh264.org/" 3HOMEPAGE = "http://www.openh264.org/"
4SECTION = "libs/multimedia" 4SECTION = "libs/multimedia"
5 5
6DEPENDS = "${@oe.utils.conditional('TARGET_ARCH', 'i386', 'nasm-native', \ 6DEPENDS_x86 += "nasm-native"
7 oe.utils.conditional('TARGET_ARCH', 'x86_64', 'nasm-native', \ 7DEPENDS_x86-64 += "nasm-native"
8 '', d), d)}"
9 8
10LICENSE = "BSD-2-Clause" 9LICENSE = "BSD-2-Clause"
11LICENSE_FLAGS = "commercial" 10LICENSE_FLAGS = "commercial"
@@ -17,14 +16,14 @@ SRC_URI[sha256sum] = "9c07c38d7de00046c9c52b12c76a2af7648b70d05bd5460c8b67f68957
17 16
18COMPATIBLE_MACHINE_armv7a = "(.*)" 17COMPATIBLE_MACHINE_armv7a = "(.*)"
19COMPATIBLE_MACHINE_aarch64 = "(.*)" 18COMPATIBLE_MACHINE_aarch64 = "(.*)"
20COMPATIBLE_MACHINE_i386 = "(.*)" 19COMPATIBLE_MACHINE_x86 = "(.*)"
21COMPATIBLE_MACHINE_x86-64 = "(.*)" 20COMPATIBLE_MACHINE_x86-64 = "(.*)"
22COMPATIBLE_MACHINE_mips = "(.*)" 21COMPATIBLE_MACHINE_mips = "(.*)"
23COMPATIBLE_MACHINE_mips64 = "(.*)" 22COMPATIBLE_MACHINE_mips64 = "(.*)"
24 23
25EXTRA_OEMAKE_armv7a = "ARCH=arm" 24EXTRA_OEMAKE_armv7a = "ARCH=arm"
26EXTRA_OEMAKE_aarch64 = "ARCH=arm64" 25EXTRA_OEMAKE_aarch64 = "ARCH=arm64"
27EXTRA_OEMAKE_i386 = "ARCH=i386" 26EXTRA_OEMAKE_x86 = "ARCH=i386"
28EXTRA_OEMAKE_x86-64 = "ARCH=x86_64" 27EXTRA_OEMAKE_x86-64 = "ARCH=x86_64"
29EXTRA_OEMAKE_mips = "ARCH=mips" 28EXTRA_OEMAKE_mips = "ARCH=mips"
30EXTRA_OEMAKE_mips64 = "ARCH=mips64" 29EXTRA_OEMAKE_mips64 = "ARCH=mips64"