download.lst | 4 ++-- external/curl/ExternalProject_curl.mk | 5 +++-- external/libtommath/ExternalProject_libtommath.mk | 4 +--- external/libxml2/ExternalProject_xml2.mk | 6 +++--- external/libxmlsec/ExternalProject_xmlsec.mk | 5 +++-- external/libxslt/ExternalProject_xslt.mk | 5 +++-- external/openssl/ExternalProject_openssl.mk | 2 ++ external/postgresql/ExternalProject_postgresql.mk | 8 ++++---- solenv/gbuild/ExternalProject.mk | 2 +- solenv/gbuild/platform/com_MSC_class.mk | 11 +++++++++-- 10 files changed, 31 insertions(+), 21 deletions(-)
New commits: commit 5dec00f8fd25b176fa25f088c54cb15b166617eb Author: Thorsten Behrens <thorsten.behr...@allotropia.de> AuthorDate: Wed Jun 14 13:34:52 2023 +0200 Commit: Thorsten Behrens <thorsten.behr...@allotropia.de> CommitDate: Wed Jun 14 13:34:52 2023 +0200 openssl: upgrade to release 1.1.1t Fixes CVE-2023-0286 CVE-2023-0215 CVE-2022-4450 CVE-2022-4304 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146653 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de> (cherry picked from commit f9229fdadbd205a8953577efc72a6e43717c764e) (cherry picked from commit ba359c09226756865d3813fee08514384257ae58) Change-Id: I93ce0362b17bd07b0644564a0676daaa56bc8b50 diff --git a/download.lst b/download.lst index 2e8f5b2aea0a..89860176ad77 100644 --- a/download.lst +++ b/download.lst @@ -177,8 +177,8 @@ export OPENCOLLADA_SHA256SUM := 8f25d429237cde289a448c82a0a830791354ccce5ee40d77 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2 export OPENLDAP_SHA256SUM := 99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34 export OPENLDAP_TARBALL := openldap-2.4.59.tgz -export OPENSSL_SHA256SUM := c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa -export OPENSSL_TARBALL := openssl-1.1.1s.tar.gz +export OPENSSL_SHA256SUM := 8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b +export OPENSSL_TARBALL := openssl-1.1.1t.tar.gz export ORCUS_SHA256SUM := 676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908 export ORCUS_TARBALL := liborcus-0.12.1.tar.gz export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb commit 0134b9d3f447cf43d0f537323d7dafc355dabd51 Author: Xisco Fauli <xiscofa...@libreoffice.org> AuthorDate: Wed Nov 2 20:29:51 2022 +0100 Commit: Thorsten Behrens <thorsten.behr...@allotropia.de> CommitDate: Wed Jun 14 13:33:22 2023 +0200 upgrade to openssl-1.1.1s Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142184 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> (cherry picked from commit 23e6227ab347a00b235fb00892b379ef4e3a0d35) (cherry picked from commit 2c06d55c8e43368920780e55c62e1e65fdefba04) Change-Id: Ic0f1fca7ef73b3a443c24d2bcc7f234be331a05b diff --git a/download.lst b/download.lst index 2c413cd593f8..2e8f5b2aea0a 100644 --- a/download.lst +++ b/download.lst @@ -177,8 +177,8 @@ export OPENCOLLADA_SHA256SUM := 8f25d429237cde289a448c82a0a830791354ccce5ee40d77 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2 export OPENLDAP_SHA256SUM := 99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34 export OPENLDAP_TARBALL := openldap-2.4.59.tgz -export OPENSSL_SHA256SUM := d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca -export OPENSSL_TARBALL := openssl-1.1.1q.tar.gz +export OPENSSL_SHA256SUM := c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa +export OPENSSL_TARBALL := openssl-1.1.1s.tar.gz export ORCUS_SHA256SUM := 676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908 export ORCUS_TARBALL := liborcus-0.12.1.tar.gz export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb commit d0b0ee8f459f2d99a2ed88094c1528ce9e5b1bee Author: Taichi Haradaguchi <20001...@ymail.ne.jp> AuthorDate: Tue Sep 6 14:42:20 2022 +0900 Commit: Thorsten Behrens <thorsten.behr...@allotropia.de> CommitDate: Wed Jun 14 13:32:48 2023 +0200 upgrade openssl-1.1.1q Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139463 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> (cherry picked from commit 96db5e3d610ede2ed82f1ab7673ac6d1c69fd588) (cherry picked from commit 9da5e4107e74d7590fbf44f5f4f24ed620852f91) Change-Id: I2317e734f074cf7301a6081cf3d2221beeaf5ad1 diff --git a/download.lst b/download.lst index 7281ab02a696..2c413cd593f8 100644 --- a/download.lst +++ b/download.lst @@ -177,8 +177,8 @@ export OPENCOLLADA_SHA256SUM := 8f25d429237cde289a448c82a0a830791354ccce5ee40d77 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2 export OPENLDAP_SHA256SUM := 99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34 export OPENLDAP_TARBALL := openldap-2.4.59.tgz -export OPENSSL_SHA256SUM := f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 -export OPENSSL_TARBALL := openssl-1.1.1m.tar.gz +export OPENSSL_SHA256SUM := d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca +export OPENSSL_TARBALL := openssl-1.1.1q.tar.gz export ORCUS_SHA256SUM := 676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908 export ORCUS_TARBALL := liborcus-0.12.1.tar.gz export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb commit 20f9c8b9a2784167b67a485ecabaa3c2c5763c26 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Sat Jan 22 12:55:40 2022 +0000 Commit: Thorsten Behrens <thorsten.behr...@allotropia.de> CommitDate: Wed Jun 14 13:32:22 2023 +0200 upgrade to openssl-1.1.1m Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128769 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> (cherry picked from commit 0f2b8305ed31746cd4dca33aa080adb220109353) (cherry picked from commit 8cc04821ce091e80dbb430c487340b85da9cd1a4) Change-Id: I7c3e576501b4587a0f6814cdc4895663ef6d3f79 diff --git a/download.lst b/download.lst index 13acb71691b7..7281ab02a696 100644 --- a/download.lst +++ b/download.lst @@ -177,8 +177,8 @@ export OPENCOLLADA_SHA256SUM := 8f25d429237cde289a448c82a0a830791354ccce5ee40d77 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2 export OPENLDAP_SHA256SUM := 99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34 export OPENLDAP_TARBALL := openldap-2.4.59.tgz -export OPENSSL_SHA256SUM := 0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 -export OPENSSL_TARBALL := openssl-1.1.1l.tar.gz +export OPENSSL_SHA256SUM := f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 +export OPENSSL_TARBALL := openssl-1.1.1m.tar.gz export ORCUS_SHA256SUM := 676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908 export ORCUS_TARBALL := liborcus-0.12.1.tar.gz export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb commit ff38f082e6e3602580578071c1ac680e1f18b32c Author: Michael Stahl <michael.st...@allotropia.de> AuthorDate: Wed Aug 25 11:16:46 2021 +0200 Commit: Thorsten Behrens <thorsten.behr...@allotropia.de> CommitDate: Wed Jun 14 13:31:54 2023 +0200 openssl: upgrade to release 1.1.1l Fixes CVE-2021-3712, CVE-2021-3711 (not obvious if any of them affect LO) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121026 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.st...@allotropia.de> (cherry picked from commit 5c391f4346e86bd5d7528fbb42a3af64f98a03d3) (cherry picked from commit b0349f8e6752781be18848c6ecb23f117f025341) Change-Id: I98652348977a5a3c728f1d4fdf7293b76a93b630 diff --git a/download.lst b/download.lst index 9498ef173ef5..13acb71691b7 100644 --- a/download.lst +++ b/download.lst @@ -177,8 +177,8 @@ export OPENCOLLADA_SHA256SUM := 8f25d429237cde289a448c82a0a830791354ccce5ee40d77 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2 export OPENLDAP_SHA256SUM := 99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34 export OPENLDAP_TARBALL := openldap-2.4.59.tgz -export OPENSSL_SHA256SUM := 892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5 -export OPENSSL_TARBALL := openssl-1.1.1k.tar.gz +export OPENSSL_SHA256SUM := 0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 +export OPENSSL_TARBALL := openssl-1.1.1l.tar.gz export ORCUS_SHA256SUM := 676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908 export ORCUS_TARBALL := liborcus-0.12.1.tar.gz export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb commit 65b5a48772a66b30570743a71376849e64418b15 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Sat Aug 14 19:03:24 2021 +0100 Commit: Thorsten Behrens <thorsten.behr...@allotropia.de> CommitDate: Wed Jun 14 13:31:21 2023 +0200 upgrade to openssl-1.1.1k Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120490 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> (cherry picked from commit c6604b69cf7f84146cae541366c023eaff4c59b6) (cherry picked from commit 442af9c1eaede030139415d1902a7bd8f8ce43d1) Change-Id: Ibd930ab4f97e2f74868b73163d7f2f46fb466749 diff --git a/download.lst b/download.lst index b42e4eb3d526..9498ef173ef5 100644 --- a/download.lst +++ b/download.lst @@ -177,8 +177,8 @@ export OPENCOLLADA_SHA256SUM := 8f25d429237cde289a448c82a0a830791354ccce5ee40d77 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2 export OPENLDAP_SHA256SUM := 99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34 export OPENLDAP_TARBALL := openldap-2.4.59.tgz -export OPENSSL_SHA256SUM := e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242 -export OPENSSL_TARBALL := openssl-1.1.1i.tar.gz +export OPENSSL_SHA256SUM := 892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5 +export OPENSSL_TARBALL := openssl-1.1.1k.tar.gz export ORCUS_SHA256SUM := 676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908 export ORCUS_TARBALL := liborcus-0.12.1.tar.gz export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb commit 0c55313ea8fc8258e73759735358a71ed148ca54 Author: Michael Stahl <michael.st...@allotropia.de> AuthorDate: Tue Jan 5 13:45:43 2021 +0100 Commit: Thorsten Behrens <thorsten.behr...@allotropia.de> CommitDate: Wed Jun 14 13:30:37 2023 +0200 openssl: upgrade to release 1.1.1i Fixes CVE-2020-1971 * openssl-macos-arm64.patch.1: remove, was fixed upstream Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108804 Tested-by: Michael Stahl <michael.st...@allotropia.de> Reviewed-by: Michael Stahl <michael.st...@allotropia.de> (cherry picked from commit adfceaf32651f6ef17a9b63906366818b667d6b5) (cherry picked from commit ae45fff6f05c1636f23f8dabfc942e32f63a0b01) Change-Id: I405270228682025bf26240e3ea923bfd234068f5 diff --git a/download.lst b/download.lst index 27b84e409e9a..b42e4eb3d526 100644 --- a/download.lst +++ b/download.lst @@ -177,8 +177,8 @@ export OPENCOLLADA_SHA256SUM := 8f25d429237cde289a448c82a0a830791354ccce5ee40d77 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2 export OPENLDAP_SHA256SUM := 99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34 export OPENLDAP_TARBALL := openldap-2.4.59.tgz -export OPENSSL_SHA256SUM := ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46 -export OPENSSL_TARBALL := openssl-1.1.1g.tar.gz +export OPENSSL_SHA256SUM := e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242 +export OPENSSL_TARBALL := openssl-1.1.1i.tar.gz export ORCUS_SHA256SUM := 676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908 export ORCUS_TARBALL := liborcus-0.12.1.tar.gz export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb commit c698e1a79e5a1991ea7e9850f6064d1beff21a9a Author: Michael Stahl <mst...@redhat.com> AuthorDate: Wed Nov 1 11:26:21 2017 +0100 Commit: Thorsten Behrens <thorsten.behr...@allotropia.de> CommitDate: Wed Jun 14 13:29:35 2023 +0200 gbuild: ExternalProject: improve NMAKE handling - move actual variables into com_MSC_class.mk - use export ... && to set the variables, so they affect all subsequent commands, not just the first one - clear MAKE as well, as that is apparently used by nmake, but can only point to GNU make - set CC, because nmake apparently can interpret C:/Progra~1/.../cl.exe etc. etc. as a "C:" command with some additional arguments which only changes the current directory, without even invoking the shell, which tends to cause profanities to be uttered for extended periods of time Change-Id: Ia7b1e6a70d6ac116d4ef0312d2aa1a4747fb8cbf Reviewed-on: https://gerrit.libreoffice.org/44159 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Michael Stahl <mst...@redhat.com> diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk index e476b196301a..402437d6f567 100644 --- a/solenv/gbuild/ExternalProject.mk +++ b/solenv/gbuild/ExternalProject.mk @@ -220,7 +220,7 @@ $(if $(findstring YES,$(UNPACKED_IS_BIN_TARBALL)),\ $(call gb_Helper_print_on_error,cd $(EXTERNAL_WORKDIR)/$(3) && \ unset Platform && \ $(if $(WRAPPERS),export $(WRAPPERS) &&) \ - $(if $(NMAKE),INCLUDE="$(gb_ExternalProject_INCLUDE)" LIB="$(ILIB)" MAKEFLAGS=) \ + $(if $(NMAKE),export $(NMAKE) &&) \ $(2) && touch $@,$(EXTERNAL_WORKDIR)/$(if $(3),$(3)/,)$(if $(4),$(4),$(1).log)) ) endef diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index fde4c75c5505..f184e899d0bb 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -530,11 +530,11 @@ $(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_Executable_ge $(call gb_ExternalProject_get_state_target,$(1),$(2)): WRAPPERS := $(gb_AUTOCONF_WRAPPERS) endef -# Set INCLUDE and LIB variables and unset MAKEFLAGS when using nmake +# Set INCLUDE and LIB variables and unset MAKE/MAKEFLAGS when using nmake # # gb_ExternalProject_use_nmake project state_target define gb_ExternalProject_use_nmake -$(call gb_ExternalProject_get_state_target,$(1),$(2)): NMAKE := $(true) +$(call gb_ExternalProject_get_state_target,$(1),$(2)): NMAKE := $(gb_NMAKE_VARS) endef # if ccache is enabled, then split it and use lastword as REAL_FOO @@ -552,6 +552,13 @@ gb_AUTOCONF_WRAPPERS = \ gb_ExternalProject_INCLUDE := \ $(subst -I,,$(subst $(WHITESPACE),;,$(subst -I. , ,$(SOLARINC)))) +gb_NMAKE_VARS = \ + CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter -%,$(CC))" \ + INCLUDE="$(gb_ExternalProject_INCLUDE)" \ + LIB="$(ILIB)" \ + MAKEFLAGS= \ + MAKE= + # InstallScript class gb_InstallScript_EXT := .inf commit 35f6e88cada03ac1d6b60c6a5257533f2ae1240d Author: Michael Stahl <mst...@redhat.com> AuthorDate: Wed Nov 1 11:52:56 2017 +0100 Commit: Thorsten Behrens <thorsten.behr...@allotropia.de> CommitDate: Wed Jun 14 13:29:15 2023 +0200 external: consistently use gb_ExternalProject_use_nmake ... instead of hard-coding some subset of the variables everywhere. Change-Id: I5eac5663563ee9d6cb7b57f5f6e9d55560587276 Reviewed-on: https://gerrit.libreoffice.org/44167 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Michael Stahl <mst...@redhat.com> diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index f72c7abbb487..5ef2cd66ac5d 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -72,10 +72,11 @@ $(call gb_ExternalProject_get_state_target,curl,build): else ifeq ($(COM),MSC) +$(eval $(call gb_ExternalProject_use_nmake,curl,build)) + $(call gb_ExternalProject_get_state_target,curl,build): $(call gb_ExternalProject_run,build,\ - CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter -%,$(CC))" \ - MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc \ + nmake -f Makefile.vc \ mode=dll \ VC=12 \ $(if $(filter X86_64,$(CPUNAME)),MACHINE=x64,MACHINE=x86) \ diff --git a/external/libtommath/ExternalProject_libtommath.mk b/external/libtommath/ExternalProject_libtommath.mk index 955adc8c4d3d..f534e62a126d 100644 --- a/external/libtommath/ExternalProject_libtommath.mk +++ b/external/libtommath/ExternalProject_libtommath.mk @@ -18,9 +18,7 @@ $(eval $(call gb_ExternalProject_use_nmake,libtommath,build)) ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,libtommath,build): $(call gb_ExternalProject_run,build,\ - export CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter -%,$(CC))" \ - && export LIB="$(ILIB)" \ - && nmake -nologo -f makefile.msvc \ + nmake -nologo -f makefile.msvc \ ) else $(call gb_ExternalProject_get_state_target,libtommath,build) : diff --git a/external/libxml2/ExternalProject_xml2.mk b/external/libxml2/ExternalProject_xml2.mk index 54815e55d812..3982499e187d 100644 --- a/external/libxml2/ExternalProject_xml2.mk +++ b/external/libxml2/ExternalProject_xml2.mk @@ -16,14 +16,14 @@ $(eval $(call gb_ExternalProject_register_targets,xml2,\ ifeq ($(OS),WNT) $(call gb_ExternalProject_use_external_project,xml2,icu) +$(eval $(call gb_ExternalProject_use_nmake,xml2,build)) + $(call gb_ExternalProject_get_state_target,xml2,build): $(call gb_ExternalProject_run,build,\ cscript /e:javascript configure.js \ iconv=no icu=yes sax1=yes $(if $(MSVC_USE_DEBUG_RUNTIME),run_debug=yes cruntime=/MDd) \ $(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \ - && unset MAKEFLAGS \ - && INCLUDE="$(subst -I,,$(subst $(WHITESPACE),;,$(SOLARINC)))" \ - LIB="$(ILIB)" nmake \ + && nmake \ ,win32) else # OS!=WNT $(call gb_ExternalProject_get_state_target,xml2,build): diff --git a/external/libxmlsec/ExternalProject_xmlsec.mk b/external/libxmlsec/ExternalProject_xmlsec.mk index 66abd02ac3a5..253e88d96565 100644 --- a/external/libxmlsec/ExternalProject_xmlsec.mk +++ b/external/libxmlsec/ExternalProject_xmlsec.mk @@ -21,13 +21,14 @@ $(eval $(call gb_ExternalProject_register_targets,xmlsec,\ ifeq ($(OS),WNT) +$(eval $(call gb_ExternalProject_use_nmake,xmlsec,build)) + $(call gb_ExternalProject_get_state_target,xmlsec,build) : $(call gb_ExternalProject_run,build,\ cscript /e:javascript configure.js crypto=mscrypto xslt=no iconv=no static=no \ lib=$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc \ $(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \ - && unset MAKEFLAGS \ - && LIB="$(ILIB)" nmake \ + && nmake \ ,win32) else diff --git a/external/libxslt/ExternalProject_xslt.mk b/external/libxslt/ExternalProject_xslt.mk index 02c239b069ee..77875e185ace 100644 --- a/external/libxslt/ExternalProject_xslt.mk +++ b/external/libxslt/ExternalProject_xslt.mk @@ -15,14 +15,15 @@ $(eval $(call gb_ExternalProject_register_targets,xslt,\ build \ )) ifeq ($(OS),WNT) +$(eval $(call gb_ExternalProject_use_nmake,xslt,build)) + $(call gb_ExternalProject_get_state_target,xslt,build): $(call gb_ExternalProject_run,build,\ cscript /e:javascript configure.js \ $(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \ vcmanifest=yes \ lib=$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc \ - && unset MAKEFLAGS \ - && LIB="$(ILIB)" nmake \ + && nmake \ ,win32) else # OS!=WNT $(call gb_ExternalProject_get_state_target,xslt,build): diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk index 6a84b273d7c7..4095cdb89d27 100644 --- a/external/openssl/ExternalProject_openssl.mk +++ b/external/openssl/ExternalProject_openssl.mk @@ -57,6 +57,8 @@ OPENSSL_PLATFORM := \ ) ifeq ($(COM),MSC) +$(eval $(call gb_ExternalProject_use_nmake,openssl,build)) + $(call gb_ExternalProject_get_state_target,openssl,build): $(call gb_ExternalProject_run,build,\ CONFIGURE_INSIST=1 $(PERL) Configure $(OPENSSL_PLATFORM) no-tests no-multilib \ diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk index bd5335c2fedf..07a9f7dd00e3 100644 --- a/external/postgresql/ExternalProject_postgresql.mk +++ b/external/postgresql/ExternalProject_postgresql.mk @@ -20,12 +20,12 @@ $(eval $(call gb_ExternalProject_register_targets,postgresql,\ ifeq ($(OS),WNT) +$(eval $(call gb_ExternalProject_use_nmake,postgresql,build)) + $(call gb_ExternalProject_get_state_target,postgresql,build) : $(call gb_ExternalProject_run,build,\ - unset MAKEFLAGS && \ - MSBFLAGS=/p:Platform=$(if $(filter X86_64,$(CPUNAME)),x64,Win32) \ - $(PERL) build.pl $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) libpq \ - ,src/tools/msvc) + nmake -f win32.mak USE_SSL=1 USE_LDAP=1 \ + ,src) else