Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv31889
Modified Files:
lpsolve-extra.info
Log Message:
update _ for updated glpk
Index: lpsolve-extra.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/lpsolve-extra.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lpsolve-extra.info 6 Feb 2007 23:13:56 -0000 1.2
+++ lpsolve-extra.info 12 Feb 2007 17:40:44 -0000 1.3
@@ -2,11 +2,12 @@
Package: lpsolve-extra
Description: External Language Interfaces for lpsolve
Version: 5.5.0.10
-Revision: 1
+Revision: 2
# rev-up and adapt next line when version-increases of lpsolve or glpk
-Type: glpk (4.10), maj (5.5)
+Type: glpk (4.13), maj (5.5)
-BuildDepends: lpsolve%type_raw[maj]-dev (>= %v-1), glpk (>=
%type_raw[glpk]-1), bison, flex, sed | ssed
+#BuildDepends: lpsolve%type_raw[maj]-dev (>= %v-1), glpk (>=
%type_raw[glpk]-1), bison, flex, sed | ssed
+BuildDepends: lpsolve%type_raw[maj]-dev (>= %v-1), bison, flex, sed | ssed
Depends: lpsolve%type_raw[maj]-shlibs (>= %type_raw[maj].0.0-1)
# we need the lp_solve source again, for yacc_read.c lp_Hash.c lp_utils.c
shared/{commonlib,myblas}.c and colamd/colamd.c
@@ -30,6 +31,10 @@
Source9: mirror:sourceforge:lpsolve/lp_solve_%v_doc.tar.gz
Source9-MD5: 1dba62834a93aa4d968cc7229659bec1
Source9ExtractDir: lp_solve_%type_raw[maj]/doc
+# 4.13 is the last version of glpk against which the MathProg xli will compile
+# (the symbols lib_set_fault_hook and lib_set_print_hook are needed, and
disappeared in 4.14)
+Source10: mirror:gnu:glpk/glpk-%type_raw[glpk].tar.gz
+Source10-MD5: d1e7142be353da423ee4662499813541
#
SourceDirectory: lp_solve_%type_raw[maj]
@@ -42,8 +47,14 @@
# "s:\.\./\.\.:%p/include/lpsolve:g; " , but we have anyway to re-expand the
lpsolve source for the .c files (cf supra).
# One could also add -llpsolve in the link line, and remove from $src all
"%p/include/lpsolve/..."
# _ so we would no longer need the lpsolve source, but afraid of compilation
under different -D's.
- # link with glpk instead of re-compiling:
- perl -pi -e 's, \$\{glpk\},,; s,I\$\{glpkdir\},I%p,; s,\-Wl,-L%p/lib -lglpk
$&,' {xli/xli_MathProg,bfp/bfp_GLPK}/ccc
+#### glpk
+# linking with glpk no longer works sine v. 4.14 .. (though for the bfp, the
next 2 lines would suffice ..):
+# accomodate changes in glpk 4.14
+# perl -pi -e 's,glp_inv_,inv_,g' bfp/bfp_GLPK/lp_glpkLU.c
+# # link with glpk instead of re-compiling:
+# perl -pi.bak -e 's, \$\{glpk\},,; s,I\$\{glpkdir\},I%p,; s,\-Wl,-L%p/lib
-lglpk $&,' {xli/xli_MathProg,bfp/bfp_GLPK}/ccc
+ perl -pi -e 's,=/glpk,=%b/../glpk-%type_raw[glpk],'
{xli/xli_MathProg,bfp/bfp_GLPK}/ccc
+####
# prior non-static declaration in lp_lib.h:2134 :
perl -pi -e 's,static (MYBOOL is_chsign),\1,' xli/xli_DIMACS/lp_Dimacs.c
# rm irrelevant files
@@ -57,7 +68,7 @@
\1if(strrchr(\2,'/') != NULL) finklib[0]=0;
\1strcat(finklib,\2);:;
s:(dlopen\().*name:\1finklib:" lp_lib.c
-# make the .bat scripts useable
+# make the .bat scripts usable
sed -ri -e 's,^del,rm,' -e 's,\r$,,' lp_rlp.bat */*/*.bat
<<
CompileScript: <<
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
