diff options
| -rw-r--r-- | meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.1.bb | 10 |
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" |