From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Sat, 2 Jun 2018 10:14:04 +0000 (+0100)
Subject: build-against-shared-lpsolve
X-Git-Tag: archive/raspbian/1%6.0.5_rc1-2+rpi1^2~32
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f66e0c4dd6a65fe7689a936e1957d65a0c6978a7;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 305b55866ae..f05267c2f33 100644
Binary files a/configure.ac and b/configure.ac differ