From 5cb87730fdf2eb5a7a5b1302c21afba71aeeb5e0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 29 Dec 2022 17:30:45 +0100 Subject: [PATCH] Revert "package/tiff: add webp optional dependency" This reverts commit 3fd6ada8dbca3370b9bb67feb2971e637cb4b11f to fix the following build failure raised because tiff is already an optional dependency of webp: package/tiff/tiff.mk:122: *** Recursive variable 'TIFF_FINAL_RECURSIVE_DEPENDENCIES' references itself (eventually). Stop. Fixes: - http://autobuild.buildroot.org/results/d8486cd1d5e56fb3719dc88b8aebc76c3e23cdc9 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tiff/Config.in | 4 ---- package/tiff/tiff.mk | 7 ------- 2 files changed, 11 deletions(-) diff --git a/package/tiff/Config.in b/package/tiff/Config.in index b9e3656e6f..d1004d6668 100644 --- a/package/tiff/Config.in +++ b/package/tiff/Config.in @@ -72,10 +72,6 @@ config BR2_PACKAGE_TIFF_UTILITIES help Install all tiff utilities. -config BR2_PACKAGE_TIFF_WEBP - bool "WEBP compression" - select BR2_PACKAGE_WEBP - config BR2_PACKAGE_TIFF_ZSTD bool "ZSTD compression" select BR2_PACKAGE_ZSTD diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index c2a4108f35..f0b56150b1 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -105,13 +105,6 @@ else TIFF_CONF_OPTS += --disable-tools endif -ifeq ($(BR2_PACKAGE_TIFF_WEBP),y) -TIFF_CONF_OPTS += --enable-webp -TIFF_DEPENDENCIES += webp -else -TIFF_CONF_OPTS += --disable-webp -endif - ifeq ($(BR2_PACKAGE_TIFF_ZSTD),y) TIFF_CONF_OPTS += --enable-zstd TIFF_DEPENDENCIES += zstd