[libreoffice] 01/02: Avoid adding empty _libs for external lpsolve

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit f877188d21676e8f60a64952998835ef58aa9fdd
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Tue Jul 25 15:48:15 2017 +0200

    Avoid adding empty _libs for external lpsolve
    
    If coinmp is disabled the linker command for libsolverlo results in empty
    "--start-group --end-group" argument.
---
 patches/build-against-shared-lpsolve.diff | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/patches/build-against-shared-lpsolve.diff b/patches/build-against-shared-lpsolve.diff
index 1f1d531..7a8c66c 100644
--- a/patches/build-against-shared-lpsolve.diff
+++ b/patches/build-against-shared-lpsolve.diff
@@ -17,12 +17,11 @@ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
 index a4daea7..0dea12d 100644
 --- a/RepositoryExternal.mk
 +++ b/RepositoryExternal.mk
-@@ -1961,7 +1961,7 @@ ifeq ($(WITH_LPSOLVER),lpsolve)
- ifneq ($(SYSTEM_LPSOLVE),)
+@@ -1961,6 +1961,7 @@ ifeq ($(WITH_LPSOLVER),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_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 \
  )

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git