diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-16 16:02:42 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-16 16:01:45 +0000 |
| commit | ec3fb334b00c1790de2bff4444f15fe1aa5bec88 (patch) | |
| tree | 3333370d6c447467599fc8f3b7ab69c7652e713f /external | |
| parent | 43d633d789d817916a11801d0bd3c927a75ac258 (diff) | |
external/harfbuzz: Remove hidden dependency on freetype
In external/harfbuzz/ExternalProject_harfbuzz.mk we are careful to configure
harfbuzz --with-freetype=no, but then harfbuzz goes on to nevertheless link some
of its programs against freetype. However, those all appear to be test programs
that we do not otherwise rely on, so just suppress building them in the first
place.
(I ran into this when trying to do a 32-bit Linux build in a 64-bit environment,
with only very limited 32-bit support installed in the system.)
Change-Id: I1bab2ff4b533e5a30d68d72ec001904cb63f5d94
Reviewed-on: https://gerrit.libreoffice.org/28963
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/harfbuzz/UnpackedTarball_harfbuzz.mk | 1 | ||||
| -rw-r--r-- | external/harfbuzz/no-freetype.patch | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk b/external/harfbuzz/UnpackedTarball_harfbuzz.mk index 9a5560fda96f..1514fd8edb6d 100644 --- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk +++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk @@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0)) $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \ external/harfbuzz/ubsan.patch \ + external/harfbuzz/no-freetype.patch \ )) ifneq ($(ENABLE_RUNTIME_OPTIMIZATIONS),TRUE) diff --git a/external/harfbuzz/no-freetype.patch b/external/harfbuzz/no-freetype.patch new file mode 100644 index 000000000000..32d62e205da3 --- /dev/null +++ b/external/harfbuzz/no-freetype.patch @@ -0,0 +1,13 @@ +--- src/Makefile.in ++++ src/Makefile.in +@@ -149,9 +149,7 @@ + @HAVE_GOBJECT_TRUE@ $(HB_GOBJECT_ENUM_headers) \ + @HAVE_GOBJECT_TRUE@ $(NULL) + +-noinst_PROGRAMS = main$(EXEEXT) test$(EXEEXT) \ +- test-buffer-serialize$(EXEEXT) test-size-params$(EXEEXT) \ +- test-would-substitute$(EXEEXT) $(am__EXEEXT_1) ++noinst_PROGRAMS = main$(EXEEXT) $(am__EXEEXT_1) + bin_PROGRAMS = + check_PROGRAMS = test-ot-tag$(EXEEXT) $(am__EXEEXT_1) + TESTS = $(am__EXEEXT_2) $(check_PROGRAMS) |