diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2022-03-31 20:33:02 +0200 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2022-10-28 21:17:00 +0200 |
| commit | 680435d7fdc2c23dc67c59c7b116108f3b93d6d9 (patch) | |
| tree | 0969ce113c8df6f5b29cbb3d419f33a17eeaa04f | |
| parent | zlib: upgrade to release 1.2.12 (diff) | |
| download | core-680435d7fdc2c23dc67c59c7b116108f3b93d6d9.tar.gz core-680435d7fdc2c23dc67c59c7b116108f3b93d6d9.zip | |
nss: build with zlib module on WNT
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132367
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 1c748fefc3c5b42e3548a1a7f5017a579982005a)
Change-Id: Ie875b4a8df1697de83a8f22cb1170a49792c47e6
Conflicts:
external/nss/ExternalProject_nss.mk
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | external/nss/ExternalProject_nss.mk | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index e3fc4bee583a..b96ca9052b61 100644 --- a/configure.ac +++ b/configure.ac @@ -8061,7 +8061,11 @@ else SYSTEM_ZLIB= BUILD_TYPE="$BUILD_TYPE ZLIB" ZLIB_CFLAGS="-I${WORKDIR}/UnpackedTarball/zlib" - ZLIB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lzlib" + if test "$COM" = "MSC"; then + ZLIB_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/zlib.lib" + else + ZLIB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lzlib" + fi fi AC_SUBST(ZLIB_CFLAGS) AC_SUBST(ZLIB_LIBS) diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 7f730cb2bc87..ac5aff355b38 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -24,9 +24,10 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta MOZ_DEBUG_FLAGS=" " \ OPT_CODE_SIZE=0) \ MOZ_MSVCVERSION=9 OS_TARGET=WIN95 \ + USE_SYSTEM_ZLIB=1 \ $(if $(filter X86_64,$(CPUNAME)),USE_64=1) \ LIB="$(ILIB)" \ - XCFLAGS="-arch:SSE $(SOLARINC)" \ + XCFLAGS="-arch:SSE $(SOLARINC) $(ZLIB_CFLAGS)" \ $(MAKE) nss_build_all RC="rc.exe $(SOLARINC)" \ NSINSTALL='$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \ NSS_DISABLE_GTESTS=1 \ |