commit: 130653df48b799615eddd99ad5972a368b0f03e7
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 22 07:59:13 2018 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sat Dec 22 08:17:57 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=130653df
app-text/llpp: respect user compiler and add libdir setting
To avoid showing wrong arch linking warnings on multi-arch systems.
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
app-text/llpp/files/Makefile | 5 +++--
app-text/llpp/llpp-30.ebuild | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/app-text/llpp/files/Makefile b/app-text/llpp/files/Makefile
index 1fb99c9a211..0bd94cab00f 100644
--- a/app-text/llpp/files/Makefile
+++ b/app-text/llpp/files/Makefile
@@ -5,12 +5,13 @@ endif
# paths
PREFIX ?= /usr/local
+LIBDIR ?= /usr/lib
# includes and libs
PKGCONF_DEPS := freetype2 harfbuzz libopenjp2 libjpeg mupdf x11 zlib
CPPFLAGS += -D_GNU_SOURCE -DFFP
-CFLAGS += -g -std=c99 -pedantic -Wall -Wextra -Wshadow $(shell pkg-config
--cflags $(PKGCONF_DEPS))
-LDLIBS = -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-30.ebuild b/app-text/llpp/llpp-30.ebuild
index 9f5ec30d506..3ba1ce6fe45 100644
--- a/app-text/llpp/llpp-30.ebuild
+++ b/app-text/llpp/llpp-30.ebuild
@@ -51,7 +51,7 @@ src_prepare() {
}
src_compile() {
- emake -j1 VERSION=${PV}
+ emake -j1 VERSION=${PV} CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
}
src_install() {
