diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2023-02-13 10:59:26 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2023-02-13 17:12:43 +0000 |
| commit | 0d2ef5bd553942b1307a0a69462ae980368b2076 (patch) | |
| tree | a0e8c704720a04e526ccdc56ac88c11c0ef402c8 | |
| parent | 0fbaff8f022a5d1a09a22dbfc6395c458bfc5bfd (diff) | |
ofz#55872 fix oss-fuzz build wrt fontconfig not getting built static
change from static to dynamic was hidden away in commit:
commit d552b4a549d614a03aa9328e017dec27bd3ff41e
Date: Tue Sep 20 16:07:14 2022 +0300
Enable opening of downloaded fonts only in ForKit in Online
Change-Id: Ia6e636fdbdac31f6cf746fc70c892d71462a9619
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146895
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | external/fontconfig/ExternalPackage_fontconfig.mk | 2 | ||||
| -rw-r--r-- | external/fontconfig/ExternalProject_fontconfig.mk | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/external/fontconfig/ExternalPackage_fontconfig.mk b/external/fontconfig/ExternalPackage_fontconfig.mk index 7114f80d9507..b09931f5e807 100644 --- a/external/fontconfig/ExternalPackage_fontconfig.mk +++ b/external/fontconfig/ExternalPackage_fontconfig.mk @@ -11,6 +11,8 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fontconfig,fontconfig)) $(eval $(call gb_ExternalPackage_use_external_project,fontconfig,fontconfig)) +ifeq ($(DISABLE_DYNLOADING),) $(eval $(call gb_ExternalPackage_add_file,fontconfig,$(LIBO_LIB_FOLDER)/libfontconfig-lo.so.1.12.0,src/.libs/libfontconfig-lo.so.1.12.0)) +endif # vim: set noet sw=4 ts=4: diff --git a/external/fontconfig/ExternalProject_fontconfig.mk b/external/fontconfig/ExternalProject_fontconfig.mk index 3bbecf1d672a..efa812250db8 100644 --- a/external/fontconfig/ExternalProject_fontconfig.mk +++ b/external/fontconfig/ExternalProject_fontconfig.mk @@ -48,11 +48,14 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) : --enable-libxml2 \ ac_cv_func_fstatfs=no ac_cv_func_fstatvfs=no \ ) \ - $(if $(filter LINUX,$(OS)), \ - --disable-static \ - --prefix=/ \ - --with-add-fonts=$(fontconfig_add_fonts) \ - --with-cache-dir=/usr/lib/fontconfig/cache \ + $(if $(filter FUZZERS,$(BUILD_TYPE)), \ + --disable-shared, \ + $(if $(filter LINUX,$(OS)), \ + --disable-static \ + --prefix=/ \ + --with-add-fonts=$(fontconfig_add_fonts) \ + --with-cache-dir=/usr/lib/fontconfig/cache \ + ) \ ) \ && $(MAKE) -C src && $(MAKE) fonts.conf \ ) |