aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-04-03 12:57:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-05 12:36:46 +0100
commit3b1871b7c6df66d3bf3453668f46566b8af3e6d9 (patch)
tree2086133638721e8ddfd525bdc9c329f4ac28893e
parent4b667d268fe410a21cacaecd1b5e3bfbbe7d53d8 (diff)
downloadopenembedded-core-contrib-3b1871b7c6df66d3bf3453668f46566b8af3e6d9.tar.gz
libjpeg-turbo: don't depend on NASM for non-x86 targets
NASM is a x86-specific assembler so it is only required when building for x86 targets. Use x86-architecture and class-target overrides to depend on NASM, but explicitly disable and don't depend on it for native as complications in the native overrides meant NASM was enabled for x86-64 but disabled for x86 (this will be investigated later). Original patch by Tristan Van Berkom <tristan.vanberkom@codethink.co.uk>, more work to solve selftest failures by Richard Purdie <richard.purdie@linuxfoundation.org>. I just wrote a nice commit message. Also fix some missing whitespace in _appends. [ YOCTO #11240 ] Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.1.bb10
1 files changed, 7 insertions, 3 deletions
diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.1.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.1.bb
index 70d38f4a1a..de2eeaf78d 100644
--- a/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.1.bb
+++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.1.bb
@@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=13;md5=05bab7c7ad899d85bfba60da1a127
file://jpeglib.h;endline=16;md5=f67d70e547a2662c079781c72f877f72 \
file://djpeg.c;endline=11;md5=b90b6d2b4119f9e5807cd273f525d2af \
"
-DEPENDS = "nasm-native"
+DEPENDS_append_x86-64_class-target = " nasm-native"
+DEPENDS_append_x86_class-target = " nasm-native"
SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
file://fix-mips.patch"
@@ -26,6 +27,9 @@ RCONFLICTS_${PN} += "jpeg"
inherit autotools pkgconfig
+# Add nasm-native dependency consistently for all build arches is hard
+EXTRA_OECONF_append_class-native = " --without-simd"
+
# Work around missing x32 ABI support
EXTRA_OECONF_append_class-target = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", "--without-simd", "", d)}"
@@ -33,8 +37,8 @@ EXTRA_OECONF_append_class-target = " ${@bb.utils.contains("TUNE_FEATURES", "mx32
EXTRA_OECONF_append_class-target = " ${@bb.utils.contains("MIPSPKGSFX_FPU", "-nf", "--without-simd", "", d)}"
# Provide a workaround if Altivec unit is not present in PPC
-EXTRA_OECONF_append_class-target_powerpc = "${@bb.utils.contains("TUNE_FEATURES", "altivec", "", "--without-simd", d)}"
-EXTRA_OECONF_append_class-target_powerpc64 = "${@bb.utils.contains("TUNE_FEATURES", "altivec", "", "--without-simd", d)}"
+EXTRA_OECONF_append_class-target_powerpc = " ${@bb.utils.contains("TUNE_FEATURES", "altivec", "", "--without-simd", d)}"
+EXTRA_OECONF_append_class-target_powerpc64 = " ${@bb.utils.contains("TUNE_FEATURES", "altivec", "", "--without-simd", d)}"
PACKAGES =+ "jpeg-tools libturbojpeg"