libjpeg-turbo: use system zlib instead of bundled copy

The libjpegturbo library bundles a copy of libspng which in turn bundles
a copy of zlib.  We don't currently have a libspng recipe but we can
stop it bundling zlib.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_3.2.0.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_3.2.0.bb
index 89504419762653cd3aad744e29639f39f5b9fb8e..7a548d4e9c6a455166b32b1724a4dd70dcd37459 100644 (file)
--- a/meta/recipes-graphics/jpeg/libjpeg-turbo_3.2.0.bb
+++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_3.2.0.bb
@@ -5,6 +5,7 @@ HOMEPAGE = "http://libjpeg-turbo.org/"
 LICENSE = "BSD-3-Clause AND IJG AND Zlib"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=d21daef3b4b318f77062055059c72934"
 
+DEPENDS = "zlib"
 DEPENDS:append:x86-64:class-target = " nasm-native"
 DEPENDS:append:x86:class-target = " nasm-native"
 
@@ -28,6 +29,8 @@ export NASMENV = "--reproducible --debug-prefix-map=${WORKDIR}=${TARGET_DBGSRC_D
 EXTRA_OECMAKE += "-DCMAKE_SKIP_INSTALL_RPATH=ON"
 # Ensure the -fPIC options are used to avoid -native compile failures, e.g. on opensuse160
 EXTRA_OECMAKE += "-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
+# Use system zlib instead of the bundled copy
+EXTRA_OECMAKE += "-DWITH_SYSTEM_ZLIB=ON"
 
 # Add nasm-native dependency consistently for all build arches is hard
 EXTRA_OECMAKE:append:class-native = " -DWITH_SIMD=False"