external/postgresql/arm64.patch.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 0f75764b0efff514c5d647388b389cb2d51a8c95 Author: Xisco Fauli <xiscofa...@libreoffice.org> AuthorDate: Thu Nov 3 22:53:43 2022 +0100 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Wed Nov 16 13:17:25 2022 +0100 Fix ARM64 build after postgres upgrade to 13.8 Partially revert 096e2ba8e4fce64c04a7d7e842dd1dbab8699801 "postgresql: upgrade to release 13.8" Change-Id: I3fa2a96f9765788ab6193133c4f420eed7eb99bb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142255 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> (cherry picked from commit 2cfd5a875231cc9ae59cc495ba82efc54de2016d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142209 Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de> (cherry picked from commit afe9de4d8c972293ba6e00444ebafbbd8472d33c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142210 Reviewed-by: Michael Stahl <michael.st...@allotropia.de> Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> diff --git a/external/postgresql/arm64.patch.1 b/external/postgresql/arm64.patch.1 index 891212b18f5a..7f8f2d6e4137 100644 --- a/external/postgresql/arm64.patch.1 +++ b/external/postgresql/arm64.patch.1 @@ -40,7 +40,7 @@ diff -ur postgresql.org/src/tools/msvc/Solution.pm postgresql/src/tools/msvc/Sol --- postgresql.org/src/tools/msvc/Solution.pm 2021-03-14 02:09:15.288060770 +0100 +++ postgresql/src/tools/msvc/Solution.pm 2021-03-14 02:12:22.351726582 +0100 @@ -62,10 +62,7 @@ - if ($^O eq "MSWin32") + if (1) #($^O eq "MSWin32") { # Examine CL help output to determine if we are in 32 or 64-bit mode. - my $output = `cl /? 2>&1`;