From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Mon, 29 Jan 2018 17:52:54 +0000 (+0000)
Subject: build-against-shared-lpsolve
X-Git-Tag: archive/raspbian/1%6.0.0-1+rpi1^2~36
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=63e82e39b0539e714ab6c740b5bd6f1e14209ce5;p=libreoffice.git

build-against-shared-lpsolve


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

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 9105397ae2a..847a5b5ceb2 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2426,6 +2426,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 75262ea47f0..1ae13e05a6e 100644
Binary files a/configure.ac and b/configure.ac differ