SOURCES: lp_solve-shared.patch - use system colamd

[glen]

Author: glen                         Date: Mon Mar 26 23:39:23 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use system colamd

---- Files affected:
SOURCES:
   lp_solve-shared.patch (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SOURCES/lp_solve-shared.patch
diff -u SOURCES/lp_solve-shared.patch:1.6 SOURCES/lp_solve-shared.patch:1.7
--- SOURCES/lp_solve-shared.patch:1.6	Mon Mar 26 23:57:48 2007
+++ SOURCES/lp_solve-shared.patch	Tue Mar 27 01:39:17 2007
@@ -1,8 +1,9 @@
---- lp_solve_5.5/lpsolve55/ccc	2007-03-26 23:50:26.340742050 +0300
-+++ lp_solve_5.5/lpsolve55/ccc	2007-03-27 00:13:26.141765888 +0300
+--- lp_solve_5.5/lpsolve55/ccc	2007-03-27 00:13:26.141765888 +0300
++++ lp_solve_5.5/lpsolve55/ccc	2007-03-27 02:33:04.379627936 +0300
 @@ -1,8 +1,8 @@
- 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'
+-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
++src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.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:-cc}
  
  def=
@@ -11,15 +12,27 @@
  if [ "$PLATFORM" = "SCO_UNIX" ]
  then def='-dy -K PIC -DNOLONGLONG'
       dl=-lc
-@@ -10,7 +10,7 @@
+@@ -10,16 +10,16 @@
       so=y
  fi
  
 -opts='-O3'
 +opts=${CFLAGS:--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 -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL $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
+ 
+ if [ "$so" != "" ]
+ then
+-  $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
+-  $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl
++  $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
++  $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl -lcolamd
+ fi
+ 
+ rm *.o 2>/dev/null
 --- lp_solve_5.5/lp_solve/ccc	2007-03-27 00:10:11.387403126 +0300
 +++ lp_solve_5.5/lp_solve/ccc	2007-03-27 00:50:12.501214911 +0300
 @@ -1,9 +1,9 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/lp_solve-shared.patch?r1=1.6&r2=1.7&f=u