ports

commit bb3e27a96b7e5b6608226509eb4c6f43d9c6aa3b
parent a1d9e82403923efaf66ebdc9cf7f39214a3b2358
Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date:   Fri, 16 May 2014 17:18:37 +0000

mupdf: use hostcc, just use CFLAGS for build

Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>

Diffstat:
M
mupdf/mupdf.mk
 | 
9
+++++----

1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/mupdf/mupdf.mk b/mupdf/mupdf.mk
@@ -1,5 +1,6 @@
 TARG = mupdf
-DEPS = openssl xorglibx11 xorglibxext xorgxproto xorgxextproto xorglibxcb xorgxcbproto xorglibxau
+DEPS = openssl xorglibx11 xorglibxext xorgxproto xorgxextproto \
+	xorglibxcb xorgxcbproto xorglibxau xorglibxdmcp
 
 <$mkbuild/mk.common-noinst
 
@@ -12,7 +13,7 @@ mupdf:QV:
 	# (CROSSCOMPILE="yes" disables these in the  normal build).
 	mkdir -p generated build/${build}
 	for tool in bin2hex cmapdump cquote fontdump; do
-		CC="cc" CFLAGS="" LDFLAGS="" make scripts/${tool}
+		CC="${HOSTCC}" CFLAGS="" LDFLAGS="" make scripts/${tool}
 		cp "scripts/${tool}" "build/${build}"
 	done
 	#
@@ -27,8 +28,8 @@ mupdf:QV:
 		CROSSCOMPILE="yes" \
 		HAVE_X11="yes" \
 		HAVE_CURL="no" \
-		X11_CFLAGS="-I${xorglibx11_includedir} -I${xorglibxext_includedir} -L${xorglibx11_libdir} -L${xorglibxext_libdir}" \
-		X11_LIBS="-lX11 -lX11-xcb -lXext -lxcb -lXau" \
+		X11_CFLAGS="${CFLAGS}" \
+		X11_LIBS="${LDFLAGS}" \
 		OPENSSL_CFLAGS="-DHAVE_OPENSSL -I${openssl_includedir} -L${openssl_libdir}" \
 		OPENSSL_LIBS="-lcrypto -lssl"