RepositoryExternal.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
New commits: commit 1ad871ce0d4f2809161c8450e53c6598f449de95 Author: Caolán McNamara <caol...@redhat.com> Date: Tue Dec 20 11:37:13 2016 +0000 link to our own static fontconfig and freetype when we build them Change-Id: I143256ba37acf948931350443b2acf30c34f50a8 Reviewed-on: https://gerrit.libreoffice.org/32226 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 49d0c91..f4732df 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1287,7 +1287,10 @@ endef define gb_LinkTarget__use_freetype $(call gb_LinkTarget_use_external,$(1),freetype_headers) -$(call gb_LinkTarget_add_libs,$(1),-lfreetype) + +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,freetype)/instdir/lib -lfreetype \ +) endef @@ -1319,7 +1322,9 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ ) -$(call gb_LinkTarget_add_libs,$(1),-lfontconfig) +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,fontconfig)/src/.libs -lfontconfig \ +) endef
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits