diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-12-20 11:37:13 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-20 13:54:35 +0000 |
| commit | 1ad871ce0d4f2809161c8450e53c6598f449de95 (patch) | |
| tree | 3e1d6c8955caa0e95c95dafcd77f6e68023bb32f /RepositoryExternal.mk | |
| parent | 35816ab0af2ec0c0f5bd365b72d180e7daa42e68 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 49d0c9151e23..f4732dfbc1f8 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 |