[Libreoffice-commits] .: lpsolve/lp_solve_5.5.patch

[David Tardon]

 lpsolve/lp_solve_5.5.patch |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit d0b7ad3a446a17671b4cb7d3dd6a0106b0c46a91
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Mar 5 08:38:51 2012 +0100

    mingw: override gcc's definition of INLINE
    
    gcc defines INLINE to __inline, which leads to 'multiple definition of ...'
    error on use of liblpsolve.dll.a (e.g., in sccomp).
    
    Also use host ar and ranlib.

diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch
index 590da2e..43c9e07 100644
--- a/lpsolve/lp_solve_5.5.patch
+++ b/lpsolve/lp_solve_5.5.patch
@@ -1,9 +1,11 @@
 --- misc/build/lp_solve_5.5/lpsolve55/ccc.orig	Sat Jun 11 21:27:18 2005
 +++ misc/build/lp_solve_5.5/lpsolve55/ccc	Sun May 22 11:20:19 2011
-@@ -1,25 +1,40 @@
+@@ -1,25 +1,42 @@
  src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
 -c=cc
++ar=$AR
 +c=$CC
++ranlib=$RANLIB
  
  def=
  so=
@@ -36,11 +38,12 @@
 +
  opts='-O3'
  
- $c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
+-$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
++$c -s $inline -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
 -ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
 -ranlib liblpsolve55.a
-+ar rv liblpsolve55.$a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
-+ranlib liblpsolve55.$a
++$ar rv liblpsolve55.$a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
++$ranlib liblpsolve55.$a
  
  if [ "$so" != "" ]
  then