diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2020-03-21 15:28:36 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2020-03-23 14:32:09 +0100 |
| commit | fecca49c309fc723c524f12fa671114b316a5562 (patch) | |
| tree | c6154a9876efeb097b0522b4aff0c1d55dee8015 /external | |
| parent | c6a9454e744289cf2004b42b3c90854b2db8382b (diff) | |
add a configure check for ninja
Internal NSS now needs it for building on most platforms, so better
check early in configure.
Change-Id: I45d7038536ea1416443f3b2523f25eee22911485
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90859
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/nss/ExternalProject_nss.mk | 6 | ||||
| -rw-r--r-- | external/nss/buildsystem.patch.0 | 11 |
2 files changed, 16 insertions, 1 deletions
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index ee1a9446d41d..1ddcc1fc70e8 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -38,6 +38,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): \ COMMA=$(COMMA) \ PATH=$$(cygpath $(call gb_UnpackedTarball_get_dir,nss)):$$(cygpath $(call gb_UnpackedTarball_get_dir,gyp)):$$PATH \ MAKE=$(MAKE) \ + NINJA=$(NINJA) \ NSINSTALL='$(SRCDIR)/external/nss/nsinstall.py' \ LIB="$(ILIB)" \ RC="rc.exe $(SOLARINC)" \ @@ -51,7 +52,9 @@ $(call gb_ExternalProject_get_state_target,nss,build): \ for f in $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.dll.lib; do mv "$$f" "$${f%.dll.lib}".lib; done $(call gb_Trace_EndRange,nss,EXTERNAL) -else ifneq (,$(filter FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS))) # non-WNT gyp-based +# non-WNT gyp-based +# update nss_needs_ninja in configure.ac if the list changes +else ifneq (,$(filter FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS))) # The nss build system uses 'python', so make it find our internal python if necessary. nss_PYTHON := $(call gb_UnpackedTarball_get_dir,nss)/python @@ -69,6 +72,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta $(call gb_ExternalProject_run,build,\ COMMA=$(COMMA) \ PATH=$(call gb_UnpackedTarball_get_dir,nss):$(call gb_UnpackedTarball_get_dir,gyp):$$PATH \ + NINJA=$(NINJA) \ ./build.sh -v --disable-tests --enable-libpkix \ $(if $(ENABLE_DBGUTIL),,--opt) \ && rm -f $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.a \ diff --git a/external/nss/buildsystem.patch.0 b/external/nss/buildsystem.patch.0 index f4b876e67620..23583d1e87ba 100644 --- a/external/nss/buildsystem.patch.0 +++ b/external/nss/buildsystem.patch.0 @@ -60,6 +60,17 @@ fi run_verbose run_scanbuild ${GYP} -f ninja "${gyp_params[@]}" "$cwd/nss.gyp" +@@ -261,7 +261,9 @@ if [ "$rebuild_gyp" = 1 ]; then + fi + + # ninja. +-if hash ninja-build 2>/dev/null; then ++if test -n "$NINJA"; then ++ ninja="$NINJA" ++elif hash ninja-build 2>/dev/null; then + ninja=ninja-build + elif hash ninja 2>/dev/null; then + ninja=ninja @@ -263,4 +263,4 @@ echo "Building NSS requires an installation of ninja: https://ninja-build.org/" 1>&2 exit 3 |