[OE-core] [PATCH V2] libjpeg-turbo: don't depend on NASM for non-x86 targets

[Andre McCurdy]

On Mon, Apr 3, 2017 at 5:04 AM, Ross Burton <ross.burton at intel.com> wrote:
> 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 at codethink.co.uk>, more
> work to solve selftest failures by Richard Purdie
> <richard.purdie at linuxfoundation.org>.  I just wrote a nice commit message.
>
> Signed-off-by: Ross Burton <ross.burton at intel.com>
> ---
>  meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.1.bb | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> 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 70d38f4..6f407cc 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"

Missing space?

> +
>  # Work around missing x32 ABI support
>  EXTRA_OECONF_append_class-target = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", "--without-simd", "", d)}"
>
> --
> 2.8.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core