diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-08-23 08:43:14 +0200 |
|---|---|---|
| committer | Aron Budea <aron.budea@collabora.com> | 2021-03-24 16:19:28 +0100 |
| commit | df5bac8fd76328759a9a0b1b45b81e08883de211 (patch) | |
| tree | 7db85ffb7335974d6333edaa25dc1931b865574f | |
| parent | Update HarfBbuzz to 2.6.0 (diff) | |
| download | core-df5bac8fd76328759a9a0b1b45b81e08883de211.tar.gz core-df5bac8fd76328759a9a0b1b45b81e08883de211.zip | |
external/harfbuzz configure needs MAKE now
...after 352924a64750bb99aec54feea3af0121603c12a8 "Update HarfBbuzz to 2.6.0",
where it started to fail for me on Windows with
> config.status: error: in `/cygdrive/c/lo/core/workdir/UnpackedTarball/harfbuzz':
> config.status: error: Something went wrong bootstrapping makefile fragments
> for automatic dependency tracking. Try re-running configure with the
> '--disable-dependency-tracking' option to at least be able to build
> the package (albeit without support for automatic dependency tracking).
> See `config.log' for more details
> make[1]: *** [C:/lo/core/external/harfbuzz/ExternalProject_harfbuzz.mk:24: C:/lo/core/workdir/ExternalProject/harfbuzz/build] Error 1
because it didn't find any `make` (I only have an /opt/lo/bin/make installed).
Change-Id: I378448b2cf1c92596220b0142e4e67a83162d972
Reviewed-on: https://gerrit.libreoffice.org/77987
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 4b73cbd8d07cdefefc6d99e2a584e0b15de1be84)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112483
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Aron Budea <aron.budea@collabora.com>
| -rw-r--r-- | external/harfbuzz/ExternalProject_harfbuzz.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk index 98de3e161e54..d81f931b07c1 100644 --- a/external/harfbuzz/ExternalProject_harfbuzz.mk +++ b/external/harfbuzz/ExternalProject_harfbuzz.mk @@ -50,6 +50,7 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) : $(CXXFLAGS) $(CXXFLAGS_CXX11) \ $(ICU_UCHAR_TYPE) \ $(if $(filter LINUX,$(OS)),-fvisibility=hidden)' \ + MAKE=$(MAKE) \ && (cd $(EXTERNAL_WORKDIR)/src && $(MAKE) lib) \ ) |