From 5df363db70d25f406e6d92f906e1414eae38dafd Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Wed, 14 Sep 2022 18:32:47 -0300 Subject: [PATCH] libgd: avoid recursive and redundant dependencies Change the CONFLICTS line from the libgd-full to libgd to fix a recursive dependency. While at it, remove the redundant +LIBGD_TIFF:libtiff +LIBGD_FREETYPE:libfreetype dependencies from Package/libgd/default. Signed-off-by: Eneas U de Queiroz (cherry picked from commit 085eb34fbf7c7aaa20da35ebe2f493601c5f19b2) --- libs/libgd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libgd/Makefile b/libs/libgd/Makefile index 83a61ca6b..4ca2eff2b 100644 --- a/libs/libgd/Makefile +++ b/libs/libgd/Makefile @@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/cmake.mk define Package/libgd/default SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+libjpeg +libpng +libwebp +LIBGD_TIFF:libtiff +LIBGD_FREETYPE:libfreetype + DEPENDS:=+libjpeg +libpng +libwebp TITLE:=The GD graphics library URL:=https://libgd.github.io/ endef @@ -36,6 +36,7 @@ define Package/libgd MENU:=1 DEPENDS+=+LIBGD_TIFF:libtiff +LIBGD_FREETYPE:libfreetype VARIANT:=default + CONFLICTS:=libgd-full endef define Package/libgd-full @@ -44,7 +45,6 @@ define Package/libgd-full TITLE+=(full) VARIANT:=full PROVIDES:=libgd - CONFLICTS:=libgd endef define Package/libgd/description/default