From 126b7ffee72cc4a8ed6b8bc746c1cc92f858f7c5 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 18:25:42 +0200 Subject: [PATCH] package/mupdf: drop MUPDF_PKG_CONFIG_PACKAGES This variable might have been needed in the very distant past to help mupdf find libraries, but mupdf's Makefile now properly uses pkg-config to find the 5 libraries freetype2, gumbo, harfbuzz, libjpeg and zlib, so our code has become redundant: drop it. Signed-off-by: Thomas Petazzoni (cherry picked from commit f7deaa1330baad303afb76a7711faeeb1ddfee5d) Signed-off-by: Peter Korsgaard --- package/mupdf/mupdf.mk | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk index 08894d7980..4aef0f99e7 100644 --- a/package/mupdf/mupdf.mk +++ b/package/mupdf/mupdf.mk @@ -22,22 +22,12 @@ MUPDF_DEPENDENCIES = \ xlib_libX11 \ zlib -# The pkg-config name for gumbo-parser is `gumbo`. -MUPDF_PKG_CONFIG_PACKAGES = \ - freetype2 \ - gumbo \ - harfbuzz \ - libjpeg \ - zlib - MUPDF_CFLAGS = \ $(TARGET_CFLAGS) \ - `$(PKG_CONFIG_HOST_BINARY) --cflags $(MUPDF_PKG_CONFIG_PACKAGES)` \ -fPIC # -fPIC is needed because the Makefile doesn't append it. MUPDF_LDFLAGS = \ - $(TARGET_LDFLAGS) \ - `$(PKG_CONFIG_HOST_BINARY) --libs $(MUPDF_PKG_CONFIG_PACKAGES)` + $(TARGET_LDFLAGS) # mupdf doesn't use CFLAGS and LIBS but XCFLAGS and XLIBS instead. # with USE_SYSTEM_LIBS it will try to use system libraries instead of the bundled ones.