[Libreoffice-commits] core.git: RepositoryExternal.mk

Jan-Marek Glogowski (via logerrit) logerrit at kemper.freedesktop.org
Tue May 25 16:08:16 UTC 2021


 RepositoryExternal.mk |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 58d5f74a7b8634919d4842e623c582c570997952
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Sat May 22 21:42:26 2021 +0200
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Tue May 25 18:07:41 2021 +0200

    postgres: fix internal linking with WITH_GSSAPI
    
    Change-Id: If5a741cfe5863d0cad09463ba7e958ac0f3bb24d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116108
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 224fd7526bec..a45ffa35613d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3092,19 +3092,20 @@ $(call gb_LinkTarget_add_libs,$(1),\
 	$(call gb_UnpackedTarball_get_dir,postgresql)/$(gb_MSBUILD_CONFIG)/libpq/libpq.lib \
 )
 
-else # WNT
+else # !WNT
 
 $(call gb_LinkTarget_add_libs,$(1),\
 	$(call gb_UnpackedTarball_get_dir,postgresql)/src/interfaces/libpq/libpq$(gb_StaticLibrary_PLAINEXT) \
 	$(call gb_UnpackedTarball_get_dir,postgresql)/src/common/libpgcommon$(gb_StaticLibrary_PLAINEXT) \
 	$(call gb_UnpackedTarball_get_dir,postgresql)/src/port/libpgport$(gb_StaticLibrary_PLAINEXT) \
+    $(if $(WITH_GSSAPI),$(GSSAPI_LIBS)) \
 )
 
-endif # WNT
+endif # !WNT
 
-endef
+endef # gb_LinkTarget__use_postgresql
 
-endif # SYSTEM_POSTGRESQL
+endif # !SYSTEM_POSTGRESQL
 
 ifeq ($(ENABLE_KF5),TRUE)
 


More information about the Libreoffice-commits mailing list