diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2019-11-27 15:29:50 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2019-12-02 12:25:00 +0100 |
| commit | 04645403104c7c8a767410d1bcbd692c056818a4 (patch) | |
| tree | 0391925af1e11b22ab14cedfb4b42c65ac228ca7 | |
| parent | 318229900fe6d30d9b82256d908dadda8b2f4d61 (diff) | |
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 <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
(cherry picked from commit 94eb59078731b2e4093d983bc618d051f4e31740)
Reviewed-on: https://gerrit.libreoffice.org/84190
Tested-by: Jenkins
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 5 insertions, 1 deletions
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) |