external/fontconfig/ExternalProject_fontconfig.mk | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 1689ce98ce2b41470497a9c2468d47ee62ae638b
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Jan 11 09:14:43 2022 +0100
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Mon Sep 26 20:55:24 2022 +0200
Make external/fontconfig use -fPIC
...to prevent Library_skia from failing to link with
> /usr/bin/ld.gold: error:
workdir/UnpackedTarball/fontconfig/src/.libs/libfontconfig.a(fccfg.o): requires
dynamic R_X86_64_32 reloc which may overflow at runtime; recompile with -fPIC
etc. in a --without-system-fontconfig build
Change-Id: Idd09785096d1a8be3f3086d6e565f307fa046a60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128267
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140051
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
diff --git a/external/fontconfig/ExternalProject_fontconfig.mk
b/external/fontconfig/ExternalProject_fontconfig.mk
index 1d65173ce0f5..8cb9498fe763 100644
--- a/external/fontconfig/ExternalProject_fontconfig.mk
+++ b/external/fontconfig/ExternalProject_fontconfig.mk
@@ -25,6 +25,7 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) :
$(gb_RUN_CONFIGURE) ./configure \
--disable-shared \
--disable-silent-rules \
+ --with-pic \
$(if $(filter ANDROID,$(OS)),--with-arch=arm) \
--with-expat-includes=$(call
gb_UnpackedTarball_get_dir,expat)/lib \
--with-expat-lib=$(gb_StaticLibrary_WORKDIR) \
