external/harfbuzz/ExternalProject_harfbuzz.mk | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 4b73cbd8d07cdefefc6d99e2a584e0b15de1be84
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Aug 23 08:43:14 2019 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Aug 23 17:30:10 2019 +0200
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 <sberg...@redhat.com>
diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk
b/external/harfbuzz/ExternalProject_harfbuzz.mk
index 9bb2f5b9bc71..50def834b4d2 100644
--- a/external/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/external/harfbuzz/ExternalProject_harfbuzz.mk
@@ -49,6 +49,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) \
)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
