external/harfbuzz/ExternalProject_harfbuzz.mk | 1 +
external/icu/cross-bin/icu-config | 12 ++++++++++++
2 files changed, 13 insertions(+)
New commits:
commit 25b5e3914d42f776ae0925a3d2bff3f159c07b00
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon May 4 12:12:16 2015 +0300
Use a dummy icu-config when cross-compiling harfbuzz (to Android)
Seems that when cross-compiling to Android from Linux, we apparently
have used either the build platform's pkg-config files for ICU, or the
build platform's icu-config. Both of which are obviously the wrong
thing to do, but apparently it has worked by accident anyway.
This makes building for Android on OS X proceed past harfbuzz, at least.
Change-Id: I27351f6177438697a1cded642c8c669ba7221009
diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk
b/external/harfbuzz/ExternalProject_harfbuzz.mk
index 5e59dcb..2514124 100644
--- a/external/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/external/harfbuzz/ExternalProject_harfbuzz.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_ExternalProject_use_externals,harfbuzz,\
$(call gb_ExternalProject_get_state_target,harfbuzz,build) :
$(call gb_ExternalProject_run,build,\
+ $(if
$(CROSS_COMPILING),PATH=$(SRCDIR)/external/icu/cross-bin:$$PATH) \
./configure \
--enable-static \
--disable-shared \
diff --git a/external/icu/cross-bin/icu-config
b/external/icu/cross-bin/icu-config
new file mode 100755
index 0000000..8ccf94f
--- /dev/null
+++ b/external/icu/cross-bin/icu-config
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+case $1 in
+--version)
+ echo whatever
+ ;;
+--cppflags)
+ echo ${ICU_CFLAGS}
+ ;;
+--ldflags-searchpath)
+ echo ${ICU_LIBS}
+esac
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
