Fix NSS parallel build

Desktop / LibreOffice - Jan-Marek Glogowski [fbihome.de] - 20 November 2018 07:57 EST

This is just a minimal solution and obviously not fully parallel. We still have to walk the tree twice: 1. copy all needed headers to dist (export export_private) 2. the parallel build (libs)

The fixes are:
- Add a few rm and @$(MAKE_OBJDIR) calls to various targets
- Serialize minimal steps in nss_build_all
=> Build libs of nss/lib and nss/cmd/lib before all other
=> drop the minimal all target
- Make $(SHARED_LIBRARY) depend on $(LIBRARY), otherwise dll lib creation on Windows builds a static lib, instead of the dll one
- Drop all "export:: private_export" rules. We run this before the build and duplicate targets break the header install

Change-Id: I1c35985c90d2d63990e04a0d2bb9d8ae921a2182 Reviewed-on: https://gerrit.libreoffice.org/62011

baf0d6d65da8 Fix NSS parallel build
external/nss/ExternalProject_nss.mk | 4 +-
external/nss/UnpackedTarball_nss.mk | 1 +
external/nss/nss.parallel.patch | 653 ++++++++++++++++++++++++++++++++++++
3 files changed, 656 insertions(+), 2 deletions(-)

Upstream: cgit.freedesktop.org


  • Share