RepositoryExternal.mk | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 5e6e87f1556e484c4d4be7e3b01ef668ab602f3c
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Thu Jan 21 14:26:01 2021 +0100
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Thu Jan 21 17:28:57 2021 +0100
postgresql: fix mistake in RepositoryExternal.mk
Apparently causes "ERROR: Source for postgresql.filelist not found!" on
non-WNT.
Change-Id: I79cf9074bc8e4948febe76fc963231c916a274cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109760
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Tested-by: Jenkins
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3d9ca8da5551..03099d4aeb1c 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3050,6 +3050,12 @@ endef
else # !SYSTEM_POSTGRESQL
+ifeq ($(OS),WNT)
+$(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\
+ postgresql \
+))
+endif # WNT
+
define gb_LinkTarget__use_postgresql
$(call gb_LinkTarget_use_external_project,$(1),postgresql,full)
@@ -3062,10 +3068,6 @@ $(call gb_LinkTarget_set_include,$(1),\
ifeq ($(OS),WNT)
-$(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\
- postgresql \
-))
-
$(call gb_LinkTarget_add_libs,$(1),\
$(call
gb_UnpackedTarball_get_dir,postgresql)/$(gb_MSBUILD_CONFIG)/libpq/libpq.lib \
)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
