summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2016-01-09 01:09:45 +0100
committerMichael Weber <xmw@gentoo.org>2016-01-09 01:09:45 +0100
commit46950238707e951af8fc5592d16401d9510d002e (patch)
tree364a858867aeb00512ab2cf8a51dfb04d98d1924 /app-text/llpp/llpp-9999.ebuild
parentprofiles: mask app-text/mupdf[opengl] on arches w/o keyworded media-libs/glfw (diff)
downloadgentoo-46950238707e951af8fc5592d16401d9510d002e.tar.gz
gentoo-46950238707e951af8fc5592d16401d9510d002e.tar.bz2
gentoo-46950238707e951af8fc5592d16401d9510d002e.zip
app-text/llpp: Version bump.
Package-Manager: portage-2.2.26
Diffstat (limited to 'app-text/llpp/llpp-9999.ebuild')
-rw-r--r--app-text/llpp/llpp-9999.ebuild11
1 files changed, 5 insertions, 6 deletions
diff --git a/app-text/llpp/llpp-9999.ebuild b/app-text/llpp/llpp-9999.ebuild
index 6ae222aa5ce2..fc2df017ae0c 100644
--- a/app-text/llpp/llpp-9999.ebuild
+++ b/app-text/llpp/llpp-9999.ebuild
@@ -49,8 +49,8 @@ src_compile() {
if use static ; then
local cclib=""
local slib=""
- local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 | sed 's:-L::g') )
- for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11 fontconfig) -ljpeg -ljbig2dec ; do
+ local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 ${egl} | sed 's:-L::g') )
+ for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11 ${egl} fontconfig) -ljpeg -ljbig2dec ; do
case ${slib} in
-lm|-ldl|-lpthread)
einfo "${slib}: shared"
@@ -62,14 +62,13 @@ src_compile() {
esac
done
else
- local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11 fontconfig) -lpthread"
+ local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11 ${egl} fontconfig) -lpthread"
fi
verbose() { echo "$@" >&2 ; "$@" || die ; }
- verbose ocaml str.cma keystoml.ml < KEYS > help.ml
+ verbose sh mkhelp.sh KEYS ${PV} > help.ml
verbose printf 'let version ="%s";;\n' ${PV} >> help.ml
verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c
- verbose ${ocaml} -c -o bo.${cmo} le/bo.ml
verbose ${ocaml} -c -o help.${cmo} help.ml
verbose ${ocaml} -c -o utils.${cmo} utils.ml
verbose ${ocaml} -c -o wsi.cmi wsi.mli
@@ -80,7 +79,7 @@ src_compile() {
verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
str.${cma} unix.${cma} lablgl.${cma} link.o \
-cclib "${cclib}" \
- bo.${cmo} help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo} main.${cmo}
+ help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo} main.${cmo}
}
src_install() {