Browse Source

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 <cotequeiroz@gmail.com>
(cherry picked from commit 085eb34fbf)
lilik-openwrt-22.03
Eneas U de Queiroz 2 years ago
committed by Josef Schlehofer
parent
commit
5df363db70
No known key found for this signature in database GPG Key ID: B950216FE4329F4C
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      libs/libgd/Makefile

+ 2
- 2
libs/libgd/Makefile View File

@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/cmake.mk
define Package/libgd/default define Package/libgd/default
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
DEPENDS:=+libjpeg +libpng +libwebp +LIBGD_TIFF:libtiff +LIBGD_FREETYPE:libfreetype
DEPENDS:=+libjpeg +libpng +libwebp
TITLE:=The GD graphics library TITLE:=The GD graphics library
URL:=https://libgd.github.io/ URL:=https://libgd.github.io/
endef endef
@ -36,6 +36,7 @@ define Package/libgd
MENU:=1 MENU:=1
DEPENDS+=+LIBGD_TIFF:libtiff +LIBGD_FREETYPE:libfreetype DEPENDS+=+LIBGD_TIFF:libtiff +LIBGD_FREETYPE:libfreetype
VARIANT:=default VARIANT:=default
CONFLICTS:=libgd-full
endef endef
define Package/libgd-full define Package/libgd-full
@ -44,7 +45,6 @@ define Package/libgd-full
TITLE+=(full) TITLE+=(full)
VARIANT:=full VARIANT:=full
PROVIDES:=libgd PROVIDES:=libgd
CONFLICTS:=libgd
endef endef
define Package/libgd/description/default define Package/libgd/description/default


Loading…
Cancel
Save