From 1e3cbc2e503cda3dd5907bff9987a51305700efe Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 19 Apr 2021 08:58:36 +0100 Subject: [PATCH] app-text/llpp: respect PKG_CONFIG Signed-off-by: Sam James --- app-text/llpp/files/Makefile | 4 ++-- app-text/llpp/files/llpp-33-makefile | 4 ++-- app-text/llpp/llpp-33.ebuild | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app-text/llpp/files/Makefile b/app-text/llpp/files/Makefile index 0bd94cab00f2a..66a3fe4c4fd8d 100644 --- a/app-text/llpp/files/Makefile +++ b/app-text/llpp/files/Makefile @@ -10,8 +10,8 @@ LIBDIR ?= /usr/lib # includes and libs PKGCONF_DEPS := freetype2 harfbuzz libopenjp2 libjpeg mupdf x11 zlib CPPFLAGS += -D_GNU_SOURCE -DFFP -CFLAGS += -std=c99 -pedantic -Wall -Wextra -Wshadow $(shell pkg-config --cflags $(PKGCONF_DEPS)) -LDLIBS = -L$(LIBDIR) -lpthread -ljbig2dec $(shell pkg-config --libs $(PKGCONF_DEPS)) +CFLAGS += -std=c99 -pedantic -Wall -Wextra -Wshadow $(shell ${PKG_CONFIG} --cflags $(PKGCONF_DEPS)) +LDLIBS = -L$(LIBDIR) -lpthread -ljbig2dec $(shell ${PKG_CONFIG} --libs $(PKGCONF_DEPS)) # ocaml CAMLOPT = ocamlopt diff --git a/app-text/llpp/files/llpp-33-makefile b/app-text/llpp/files/llpp-33-makefile index 3a5c3122e251a..6e4eabf8bf5c9 100644 --- a/app-text/llpp/files/llpp-33-makefile +++ b/app-text/llpp/files/llpp-33-makefile @@ -10,8 +10,8 @@ LIBDIR ?= /usr/lib # includes and libs PKGCONF_DEPS := freetype2 harfbuzz libopenjp2 libjpeg mupdf x11 zlib CPPFLAGS += -D_GNU_SOURCE -DFFP -CFLAGS += -std=c99 -pedantic -Wall -Wextra -Wshadow $(shell pkg-config --cflags $(PKGCONF_DEPS)) -LDLIBS = -L$(LIBDIR) -lpthread -ljbig2dec $(shell pkg-config --libs $(PKGCONF_DEPS)) +CFLAGS += -std=c99 -pedantic -Wall -Wextra -Wshadow $(shell ${PKG_CONFIG} --cflags $(PKGCONF_DEPS)) +LDLIBS = -L$(LIBDIR) -lpthread -ljbig2dec $(shell ${PKG_CONFIG} --libs $(PKGCONF_DEPS)) # ocaml CAMLOPT = ocamlopt diff --git a/app-text/llpp/llpp-33.ebuild b/app-text/llpp/llpp-33.ebuild index d8c83ada0750e..f4c105ef4d10d 100644 --- a/app-text/llpp/llpp-33.ebuild +++ b/app-text/llpp/llpp-33.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -51,6 +51,7 @@ src_prepare() { } src_compile() { + tc-export PKG_CONFIG emake -j1 VERSION=${PV} CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)" }