From dfb42ab91b7b1f58bc89362403321ed7063dda9f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 23 Apr 2022 22:39:23 +0200 Subject: [PATCH] package/assimp: force libzlib Force libzlib instead of depending on it Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/assimp/Config.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/package/assimp/Config.in b/package/assimp/Config.in index 833e559a6f..5ffb50cd79 100644 --- a/package/assimp/Config.in +++ b/package/assimp/Config.in @@ -2,8 +2,9 @@ config BR2_PACKAGE_ASSIMP bool "assimp" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR - depends on BR2_PACKAGE_LIBZLIB depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr + select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_ZLIB_FORCE_LIBZLIB help Open Asset Import Library (assimp) is a portable Open Source library to import various well-known 3D model formats in a @@ -14,11 +15,7 @@ config BR2_PACKAGE_ASSIMP http://www.assimp.org comment "assimp needs a toolchain w/ C++, wchar" - depends on BR2_PACKAGE_LIBZLIB depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR -comment "assimp needs libzlib" - depends on !BR2_PACKAGE_LIBZLIB - comment "assimp needs exception_ptr" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735