From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Mon, 20 Mar 2017 10:46:38 +0000 (+0000)
Subject: build-against-shared-lpsolve
X-Git-Tag: archive/raspbian/1%5.2.7-1+rpi1~1^2~24
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=af7c18eb5636ed7a7b8dc1e73a1002030a1989e4;p=libreoffice.git

build-against-shared-lpsolve


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

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 24bbab79fc2..77052725201 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2325,7 +2325,7 @@ ifneq ($(ENABLE_LPSOLVE),)
 ifneq ($(SYSTEM_LPSOLVE),)
 
 define gb_LinkTarget__use_lpsolve
-$(call gb_LinkTarget_add_libs,$(1),-llpsolve55)
+$(call gb_LinkTarget_add_ldflags,$(1),/usr/lib/lp_solve/liblpsolve55.so -Wl$(COMMA)-rpath=/usr/lib/lp_solve)
 $(call gb_LinkTarget_add_defs,$(1),\
 	-DSYSTEM_LPSOLVE \
 )
diff --git a/configure.ac b/configure.ac
index e6adff05911..660bbb2d251 100644
Binary files a/configure.ac and b/configure.ac differ