mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

postgresql: fix mistake in RepositoryExternal.mk

Browse Source 
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 <sbergman@redhat.com>
Tested-by: Jenkins
This commit is contained in:
Michael Stahl
2021-01-21 14:26:01 +01:00
parent af6c3d95da
commit 5e6e87f155
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
RepositoryExternal.mk
View File

@@ -3050,6 +3050,12 @@ endef
else # !SYSTEM_POSTGRESQL else # !SYSTEM_POSTGRESQL
ifeq ($(OS),WNT)
$(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\
postgresql \
))
endif # WNT
define gb_LinkTarget__use_postgresql define gb_LinkTarget__use_postgresql
$(call gb_LinkTarget_use_external_project,$(1),postgresql,full) $(call gb_LinkTarget_use_external_project,$(1),postgresql,full)
@@ -3062,10 +3068,6 @@ $(call gb_LinkTarget_set_include,$(1),\
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
$(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\
postgresql \
))
$(call gb_LinkTarget_add_libs,$(1),\ $(call gb_LinkTarget_add_libs,$(1),\
$(call gb_UnpackedTarball_get_dir,postgresql)/$(gb_MSBUILD_CONFIG)/libpq/libpq.lib \ $(call gb_UnpackedTarball_get_dir,postgresql)/$(gb_MSBUILD_CONFIG)/libpq/libpq.lib \
) )