external/postgresql/arm64.patch.1 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit cd30c141caa8a0d034541d50b5d41fcfd96bb4c3
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Jun 12 09:35:14 2024 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Jun 12 10:37:00 2024 +0200
postgresql: fix arm64 build
after e4e2c7ca00151b27c8928f785af1845f918ed721
"postgresql: Upgrade to 14.12 (master only)"
Change-Id: Ie2b1a08b2bbc1504d5f8bac15b5ffc6708b6b1f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168697
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/external/postgresql/arm64.patch.1
b/external/postgresql/arm64.patch.1
index db8a3ad0a069..357a94952c39 100644
--- a/external/postgresql/arm64.patch.1
+++ b/external/postgresql/arm64.patch.1
@@ -39,11 +39,11 @@ diff -ur postgresql.org/src/tools/msvc/MSBuildProject.pm
postgresql/src/tools/ms
diff -ur postgresql.org/src/tools/msvc/Solution.pm
postgresql/src/tools/msvc/Solution.pm
--- 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 @@
+@@ -65,10 +65,7 @@
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`;
+- my $output = `cl /help 2>&1`;
- $? >> 8 == 0 or die "cl command not found";
- $self->{platform} =
- ($output =~ /^\/favor:<.+AMD64/m) ? 'x64' : 'Win32';
