download.lst | 4 ++-- instsetoo_native/CustomTarget_install.mk | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-)
New commits: commit 981146388db9877c54a0359aced74f63bf5885bb Author: Taichi Haradaguchi <[email protected]> AuthorDate: Tue Sep 6 14:42:20 2022 +0900 Commit: Andras Timar <[email protected]> CommitDate: Thu Sep 15 22:33:02 2022 +0200 upgrade openssl-1.1.1q Change-Id: I2317e734f074cf7301a6081cf3d2221beeaf5ad1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139497 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Signed-off-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139498 diff --git a/download.lst b/download.lst index 1305b08c1f75..359f5b8c6b9a 100644 --- a/download.lst +++ b/download.lst @@ -228,8 +228,8 @@ export OFFICEOTRON_SHA256SUM := f2443f27561af52324eee03a1892d9f569adc8db9e7bca55 export OFFICEOTRON_JAR := 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar 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 := d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca +export OPENSSL_TARBALL := openssl-1.1.1q.tar.gz export ORCUS_SHA256SUM := c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4 export ORCUS_TARBALL := liborcus-0.16.1.tar.bz2 export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb commit 314f236ac7e2fecccea3ede760939bcda834ccb7 Author: Thorsten Behrens <[email protected]> AuthorDate: Fri May 27 00:45:18 2022 +0200 Commit: Andras Timar <[email protected]> CommitDate: Thu Sep 15 22:31:57 2022 +0200 make_installer: convert Win to Unix path for cygwin Usual cygwin auto-conversion magic doesn't work for PATH variable, which requires proper /cygdrive/foo/bar entries. Change-Id: Ic07ffcdf7cb28c5e5702964c331f337ee811c063 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135032 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <[email protected]> diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 40c4608c20e5..f712ea74d91f 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -71,7 +71,10 @@ $(if $(GNUPARALLEL), \ , \ $(call gb_Helper_print_on_error, \ cd $(dir $@) \ - && PATH="$(SRCDIR)/solenv/bin:$$PATH" \ + $(if $(filter WNT,$(OS)), \ + && PATH="$(shell cygpath -u $(SRCDIR)/solenv/bin):$$PATH" \ + , \ + && PATH="$(SRCDIR)/solenv/bin:$$PATH") \ $(foreach curpkg,$(1),\ && call_installer.sh $(if $(verbose),-verbose,-quiet) $(curpkg) \ ),[email protected])) commit 6fe1bf4b636ca8228023270f7e50f1eb14c37c8d Author: Thorsten Behrens <[email protected]> AuthorDate: Wed May 25 13:21:26 2022 +0200 Commit: Andras Timar <[email protected]> CommitDate: Thu Sep 15 22:31:45 2022 +0200 Reduce cmd line length for make_installer calls Seems on Windows, we're hitting the 8k character max cmd line length, on setups with slightly deeper src tree path locations. Shorten length of expanded call_installer calls by putting shell script into PATH locally. Change-Id: If1cddab9e4e07a7c5ebfae7a4e88e43b1bc8b907 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134938 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <[email protected]> diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 5cbc7e4a64ab..40c4608c20e5 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -71,8 +71,9 @@ $(if $(GNUPARALLEL), \ , \ $(call gb_Helper_print_on_error, \ cd $(dir $@) \ + && PATH="$(SRCDIR)/solenv/bin:$$PATH" \ $(foreach curpkg,$(1),\ - && $(SRCDIR)/solenv/bin/call_installer.sh $(if $(verbose),-verbose,-quiet) $(curpkg) \ + && call_installer.sh $(if $(verbose),-verbose,-quiet) $(curpkg) \ ),[email protected])) endef commit a7996116d26f42a84bb099e9bfd1acc4fafb16d5 Author: Andras Timar <[email protected]> AuthorDate: Tue Aug 30 22:47:25 2022 +0200 Commit: Andras Timar <[email protected]> CommitDate: Thu Sep 15 22:31:32 2022 +0200 [cp] Collabora Office do not have langpacks on macOS Change-Id: I5ad3ea78fcc27e2c786f4264e941da8d8b94fec5 diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 2edb9ef365fa..5cbc7e4a64ab 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -111,8 +111,9 @@ else # LIBO_TEST_INSTALL $(if $(and $(filter HELP,$(BUILD_TYPE)), $(filter-out MACOSX,$(OS))), \ $(foreach lang,$(gb_HELP_LANGS), \ ":$(lang)::-helppack:$(pkgformat):nostrip" )) \ - $(foreach lang,$(instsetoo_native_WITH_LANG), \ - ":$(lang)::-languagepack:$(pkgformat):nostrip" ) ))) + $(if $(filter-out MACOSX,$(OS)), \ + $(foreach lang,$(instsetoo_native_WITH_LANG), \ + ":$(lang)::-languagepack:$(pkgformat):nostrip" )) ))) endif # LIBO_TEST_INSTALL touch $@ $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL)
