external/postgresql/ExternalProject_postgresql.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cf0a45ec68ce2eab3adae2df6d90ea02816bb1fb
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Oct 10 17:17:41 2019 +0200
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Fri Oct 11 11:09:59 2019 +0200
Pass LDFLAGS into external/postgresql
This will be needed when building against Flatpak
org.freedesktop.Sdk//19.08,
which no longer bundles krb5, so we will have a bundled libgssapi_krb5.so
at /app/lib (instead of under /usr), but which requires LDFLAGS=-L/app/lib
to
be found.
Change-Id: I8767740ab0cbb02b6ae682b7f0e21ec90ea5ddd7
Reviewed-on: https://gerrit.libreoffice.org/80620
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit cfd06eb99b8f366bfe96e4a6d3112e4c6057098b)
Reviewed-on: https://gerrit.libreoffice.org/80633
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/external/postgresql/ExternalProject_postgresql.mk
b/external/postgresql/ExternalProject_postgresql.mk
index fc4342c60f93..ba462a34a1a1 100644
--- a/external/postgresql/ExternalProject_postgresql.mk
+++ b/external/postgresql/ExternalProject_postgresql.mk
@@ -31,7 +31,7 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) :
else
postgresql_CPPFLAGS := $(ZLIB_CFLAGS)
-postgresql_LDFLAGS :=
+postgresql_LDFLAGS := $(LDFLAGS)
ifeq ($(SYSTEM_ZLIB),)
postgresql_LDFLAGS += $(ZLIB_LIBS)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
