external/lpsolve/lp_solve_5.5.patch

   1 --- misc/build/lp_solve_5.5/lpsolve55/ccc.orig  Sat Jun 11 21:27:18 2005
   2 +++ misc/build/lp_solve_5.5/lpsolve55/ccc       Sun May 22 11:20:19 2011
   3 @@ -1,25 +1,42 @@
   4  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'
   5 -c=cc
   6 +ar=$AR
   7 +c=$CC
   8 +ranlib=$RANLIB
   9
  10  def=
  11  so=
  12 -if [ "$PLATFORM" = "SCO_UNIX" ]
  13 -then def='-dy -K PIC -DNOLONGLONG'
  14 -     dl=-lc
  15 -else dl=-ldl
  16 -     so=y
  17 +soprefix=
  18 +libs=
  19 +pic=
  20 +ldflags=
  21 +inline=
  22 +if [ "$OS" = "WNT" -a "$COM" = "GCC" ]; then
  23 +     so=dll
  24 +     a=dll.a
  25 +     inline=-DINLINE=static
  26 +else
  27 +     so=so
  28 +     a=a
  29 +     soprefix=lib
  30 +     libs="-lm"
  31 +     pic=-fpic
  32 +     ldflags="-Wl,-Bsymbolic -Wl,-soname,liblpsolve55.$so"
  33  fi
  34
  35 +if [ "$OS" = "LINUX" ]; then
  36 +     libs="$libs -ldl"
  37 +fi
  38 +
  39  opts='-O3'
  40
  41 -$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
  42 +$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
  43 -ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
  44 -ranlib liblpsolve55.a
  45 +$ar rv liblpsolve55.$a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
  46 +$ranlib liblpsolve55.$a
  47
  48  if [ "$so" != "" ]
  49  then
  50 -  $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
  51 -  $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl
  52 +  $c $pic -s $inline -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
  53 +  $c -shared $ldflags -o ${soprefix}lpsolve55.$so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` $libs
  54  fi
  55
  56  rm *.o 2>/dev/null
  57 --- misc/build/lp_solve_5.5/lpsolve55/ccc.osx.orig      Thu Jun 23 22:53:08 2005
  58 +++ misc/build/lp_solve_5.5/lpsolve55/ccc.osx
  59 @@ -1,23 +1,30 @@
  60  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'
  61 -c=cc
  62 +c=$CC
  63
  64 +if test -n "$verbose"; then
  65 +    set -x
  66 +fi
  67 +
  68  def=
  69  so=
  70 +# EXTRA_LINKFLAGS is set in the ExternalProject_lpsolve.mk
  71 +extra_linkflags=$EXTRA_LINKFLAGS
  72 +
  73  if [ "$PLATFORM" = "SCO_UNIX" ]
  74  then def='-DLoadInverseLib=0 -DLoadLanguageLib=0 -D__HYPER=long'
  75  else dl=-ldl
  76       so=y
  77  fi
  78
  79 -opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME -Wno-long-double'
  80 +opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME'
  81
  82 -$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
  83 +$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
  84 -libtool -static -o liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
  85 +$LIBTOOL -static -o liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
  86
  87  if [ "$so" != "" ]
  88  then
  89 -  $c -fPIC -fno-common -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
  90 -  $c -dynamiclib liblpsolve55.a -compatibility_version 5.5.0 -current_version 5.5.0 -o liblpsolve55.dylib `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc
  91 +  $c -fPIC -fno-common -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
  92 +  $c $extra_linkflags -dynamiclib liblpsolve55.a -compatibility_version 5.5.0 -current_version 5.5.0 -o liblpsolve55.dylib `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc
  93  fi
  94
  95  rm *.o 2>/dev/null