[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 2 commits - external/postgresql

[Michael Stahl (via logerrit)]

 external/postgresql/ExternalProject_postgresql.mk |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 815a8346e1cadfcf9861f5341f3bb0cbc00e3e28
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Wed Feb 3 18:59:41 2021 +0100
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Thu Feb 4 11:51:00 2021 +0100

    postgresql: try to cargo-cult MSBuild arguments
    
    Extremely unclear to me whether these are useful or necessary,
    but the other MSBuild ones have them.
    
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110385
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
    (cherry picked from commit bbc5cc71fd1723db8cb5020f83db5cafc0f8a52a)
    
    Change-Id: Iacdd1a1e326bd9ae7c918f5b143495f613ff41d1

diff --git a/external/postgresql/ExternalProject_postgresql.mk 
b/external/postgresql/ExternalProject_postgresql.mk
index 1e0c7d848047..2d360134e6ba 100644
--- a/external/postgresql/ExternalProject_postgresql.mk
+++ b/external/postgresql/ExternalProject_postgresql.mk
@@ -24,7 +24,10 @@ $(eval $(call gb_ExternalProject_use_nmake,postgresql,build))
 
 $(call gb_ExternalProject_get_state_target,postgresql,build) :
        $(call gb_ExternalProject_run,build,\
-               MSBFLAGS=/p:Platform=$(if $(filter 
X86_64,$(CPUNAME)),x64,Win32) \
+               MSBFLAGS="/p:Platform=$(if $(filter 
X86_64,$(CPUNAME)),x64,Win32) \
+                       $(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140 
/p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \
+                       $(if $(filter 150,$(VCVER)),/p:PlatformToolset=v141 
/p:VisualStudioVersion=15.0 /ToolsVersion:15.0) \
+                       $(if $(filter 
150-10,$(VCVER)-$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))"
 \
                $(PERL) build.pl $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) 
libpq \
        ,src/tools/msvc)
 
commit 27928a11cd150d7538937109326da295adebe844
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Thu Feb 4 11:50:41 2021 +0100
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Thu Feb 4 11:50:41 2021 +0100

    Revert "postgresql: try to cargo-cult MSBuild arguments"
    
    This reverts commit 02c1cd9f93e5b5da469e9d6ff8668f415965ecfc.

diff --git a/external/postgresql/ExternalProject_postgresql.mk 
b/external/postgresql/ExternalProject_postgresql.mk
index 151b62397dd4..1e0c7d848047 100644
--- a/external/postgresql/ExternalProject_postgresql.mk
+++ b/external/postgresql/ExternalProject_postgresql.mk
@@ -24,9 +24,7 @@ $(eval $(call gb_ExternalProject_use_nmake,postgresql,build))
 
 $(call gb_ExternalProject_get_state_target,postgresql,build) :
        $(call gb_ExternalProject_run,build,\
-               MSBFLAGS="/p:Platform=$(if $(filter 
X86_64,$(CPUNAME)),x64,Win32) \
-                       $(if $(filter 160,$(VCVER)),/p:PlatformToolset=v142 
/p:VisualStudioVersion=16.0 /ToolsVersion:Current) \
-                       $(if $(filter 
10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))" \
+               MSBFLAGS=/p:Platform=$(if $(filter 
X86_64,$(CPUNAME)),x64,Win32) \
                $(PERL) build.pl $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) 
libpq \
        ,src/tools/msvc)
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits