From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Thu, 14 Dec 2017 23:29:20 +0000 (+0000)
Subject: build-against-shared-lpsolve
X-Git-Tag: archive/raspbian/1%5.4.4-1+rpi1^2~35
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2a1946b11e7cd32a05a26534143fa32abb6f84dd;p=libreoffice.git

build-against-shared-lpsolve


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

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 8ce8555a723..f3edf136455 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2362,6 +2362,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 586211d078f..d5ff2e63f36 100644
Binary files a/configure.ac and b/configure.ac differ