From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Fri, 31 Aug 2018 10:45:39 +0000 (+0100)
Subject: build-against-shared-lpsolve
X-Git-Tag: archive/raspbian/1%6.1.1_rc1-2+rpi1^2~35
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ea07fcb51fb8717266cfb2e81bd5056bb11f35aa;p=libreoffice.git

build-against-shared-lpsolve


Gbp-Pq: Name build-against-shared-lpsolve.diff
---

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index ac962732c0c..f010e5ab083 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2489,6 +2489,7 @@ ifneq ($(SYSTEM_LPSOLVE),)
 
 define gb_LinkTarget__use_lpsolve
 $(call gb_LinkTarget_add_libs,$(1),-llpsolve55)
+$(call gb_LinkTarget_add_ldflags,$(1),-L/usr/lib/lp_solve -Wl$(COMMA)-rpath=/usr/lib/lp_solve)
 $(call gb_LinkTarget_add_defs,$(1),\
 	-DSYSTEM_LPSOLVE \
 )
diff --git a/configure.ac b/configure.ac
index 2cab4f4721c..8d3d5e9f9af 100644
Binary files a/configure.ac and b/configure.ac differ