configure.ac | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 04645403104c7c8a767410d1bcbd692c056818a4
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Wed Nov 27 15:29:50 2019 +0100
Commit: Jan Holesovsky <ke...@collabora.com>
CommitDate: Mon Dec 2 12:25:00 2019 +0100
android: Fix location of the built freetype library.
Otherwise it is not found when the the fontconfig's ./configure is
running, which leads to linking failure during the fontconfig's
./configure time, which leads to an undefined HAVE_FT_GET_NEXT_CHAR
which leads to not using the actual FT_Get_Next_Char, but instead some
dummy code that leads to an infinite loop on the app startup; huh.
Change-Id: I40b7a403fbe75582bb98f15f1afe7a4050fd13aa
Reviewed-on: https://gerrit.libreoffice.org/83922
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
(cherry picked from commit 94eb59078731b2e4093d983bc618d051f4e31740)
Reviewed-on: https://gerrit.libreoffice.org/84190
Tested-by: Jenkins
diff --git a/configure.ac b/configure.ac
index 624fcaae5213..d1a1cd1b6f16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8455,7 +8455,11 @@ if test "$test_freetype" = "yes"; then
SYSTEM_FREETYPE=TRUE
else
FREETYPE_CFLAGS="${ISYSTEM}${WORKDIR}/UnpackedTarball/freetype/include"
- FREETYPE_LIBS="-L${WORKDIR}/UnpackedTarball/freetype/instdir/lib
-lfreetype"
+ if test "x$ac_config_site_64bit_host" = xYES; then
+ FREETYPE_LIBS="-L${WORKDIR}/UnpackedTarball/freetype/instdir/lib64
-lfreetype"
+ else
+ FREETYPE_LIBS="-L${WORKDIR}/UnpackedTarball/freetype/instdir/lib
-lfreetype"
+ fi
fi
AC_SUBST(FREETYPE_CFLAGS)
AC_SUBST(FREETYPE_LIBS)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
