external/postgresql/arm64.patch.1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
New commits: commit e7b162d9576ad34f9150177d4922dcb6b7f84b76 Author: Xisco Fauli <[email protected]> AuthorDate: Wed Apr 2 11:33:35 2025 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Wed Apr 2 12:43:40 2025 +0200 postgresql: fix arm64 build Change-Id: I6ca6606c53f1e3f9c6f73292f40dcae0ee1c5a68 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183615 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/external/postgresql/arm64.patch.1 b/external/postgresql/arm64.patch.1 index 357a94952c39..733bf73315ae 100644 --- a/external/postgresql/arm64.patch.1 +++ b/external/postgresql/arm64.patch.1 @@ -18,7 +18,7 @@ diff -ur postgresql.org/src/tools/msvc/Mkvcbuild.pm postgresql/src/tools/msvc/Mk diff -ur postgresql.org/src/tools/msvc/MSBuildProject.pm postgresql/src/tools/msvc/MSBuildProject.pm --- postgresql.org/src/tools/msvc/MSBuildProject.pm 2021-03-14 02:09:15.288060770 +0100 +++ postgresql/src/tools/msvc/MSBuildProject.pm 2021-03-14 02:12:22.351726582 +0100 -@@ -307,8 +307,7 @@ +@@ -310,8 +310,7 @@ : ($self->{type} eq "dll" ? 'DynamicLibrary' : 'StaticLibrary'); my $libs = $self->GetAdditionalLinkerDependencies($cfgname, ';'); @@ -26,8 +26,8 @@ diff -ur postgresql.org/src/tools/msvc/MSBuildProject.pm postgresql/src/tools/ms - $self->{platform} eq 'Win32' ? 'MachineX86' : 'MachineX64'; + my $targetmachine = "MachineARM64"; - my $includes = $self->{includes}; - unless ($includes eq '' or $includes =~ /;$/) + my $includes = join ';', @{ $self->{includes} }, ""; + @@ -347,7 +346,6 @@ <ProgramDatabaseFile>.\$cfgname\$self->{name}\$self->{name}.pdb</ProgramDatabaseFile> <GenerateMapFile>false</GenerateMapFile>
