ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

android: Fix location of the built freetype library.

Browse Source 
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
This commit is contained in:
Jan Holesovsky
2019-12-02 12:25:00 +01:00
parent 318229900f
commit 0464540310
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+5 -1
View File
@@ -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)