diff options
| author | Rene Engelhard <rene@debian.org> | 2011-06-30 10:18:47 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-25 00:19:59 +0200 |
| commit | 1821350817000893ed9643f3081fca225ca151c2 (patch) | |
| tree | 37d13b63902601dfe1cd784c0c54fef833258a5d | |
| parent | e47f76dc19e636b08b720042af018fbd428d3336 (diff) | |
apply system-lpsolve-rpath.diff from libreoffice-build
| -rw-r--r-- | solenv/inc/libs.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 52dfada097c0..7f8f67a549bb 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -338,7 +338,13 @@ MYTHESLIB=$(MYTHES_LIBS) MYTHESLIB=-lmythes-1.2 .ENDIF PYUNOLIB=-lpyuno +.IF "$(SYSTEM_LPSOLVE)" == "YES" +# FIXME. Even with -L/usr/lib/lp_solve -llpsolve55 the liblpsolve55.a from +# /usr/lib gets picked and we get a static link... +LPSOLVELIB = /usr/lib/lp_solve/liblpsolve55.so -Wl,-rpath=/usr/lib/lp_solve +.ELSE LPSOLVELIB=-llpsolve55 +.ENDIF SOFFICELIB=-lsofficeapp UNOPKGAPPLIB=-lunopkgapp TESTLIB=-ltest |