Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv17894
Modified Files:
lpsolve.info lpsolve-extra.info lpsolve-octave.info
lpsolve-python.info
Added Files:
lpsolve.patch
Log Message:
update (lpsolve-scilab not yet).
Index: lpsolve-extra.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/lpsolve-extra.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- lpsolve-extra.info 4 Aug 2008 00:14:42 -0000 1.9
+++ lpsolve-extra.info 18 Jul 2011 23:01:14 -0000 1.10
@@ -1,49 +1,55 @@
Info2: <<
Package: lpsolve-extra
Description: External Language Interfaces for lpsolve
-Version: 5.5.0.13
+Version: 5.5.2.0
Revision: 1
# rev-up and adapt next line at version-increases of lpsolve or glpk
-Type: glpk (4.13), maj (5.5)
+Type: glpk (4.44), 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), bison, flex-devel, sed |
ssed
+BuildDepends: lpsolve%type_raw[maj]-dev (>= %v-1), glpk (>=
%type_raw[glpk]-1), bison, flex, sed | ssed, fink (>= 0.24.12)
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
Source: mirror:sourceforge:lpsolve/lp_solve_%v_source.tar.gz
-Source-MD5: e8e71b1bf86267597d5776ab0f69721d
+Source-MD5: 167c0fb4ab178e0b7ab50bf0a635a836
# those are the real sources:
Source2: mirror:sourceforge:lpsolve/lp_solve_%v_xli_MathProg_source.tar.gz
-Source2-MD5: 6df8df4dc72b513756d4a0c0ef9e3cb2
+Source2-MD5: ce59814ac2857b2407bc90f716b0342b
Source3: mirror:sourceforge:lpsolve/lp_solve_%v_xli_CPLEX_source.tar.gz
-Source3-MD5: 33dad08e883fae410acfd25fea22ff29
+Source3-MD5: 1c5285c4dfe96461d83e606e174195de
Source4: mirror:sourceforge:lpsolve/lp_solve_%v_xli_DIMACS_source.tar.gz
-Source4-MD5: 41b95a5569eea1095ad983c925f2abe7
+Source4-MD5: dcfb45d81a8619521e814c7c854f1367
Source5: mirror:sourceforge:lpsolve/lp_solve_%v_xli_LINDO_source.tar.gz
-Source5-MD5: 1ba10f094a2a99a6722a862c46a73fbe
+Source5-MD5: 27b3d2ddce2ba21e33ee21b495b0efb0
Source6: mirror:sourceforge:lpsolve/lp_solve_%v_bfp_GLPK_source.tar.gz
-Source6-MD5: 5e96ac0c4a6b74766b8fb215b52e5fef
+Source6-MD5: b42c91798f593a9a62cb3ca661369836
Source7: mirror:sourceforge:lpsolve/lp_solve_%v_bfp_LUSOL_source.tar.gz
-Source7-MD5: bf24aac2663262164434f7793b0d9f0f
+Source7-MD5: 4252ce513b9914fa998fe20c838a588e
Source8: mirror:sourceforge:lpsolve/lp_solve_%v_bfp_etaPFI_source.tar.gz
-Source8-MD5: 8153b66223041bcc63f41872d1e900b4
+Source8-MD5: 2d01a13c9e530512349fb3dbaa56dfe1
Source9: mirror:sourceforge:lpsolve/lp_solve_%v_doc.tar.gz
-Source9-MD5: 1c1603964aaeb1839d0fbccd84c439bb
+Source9-MD5: 7886d6b94477c821c88142c3730f4e65
Source9ExtractDir: lp_solve_%type_raw[maj]/doc
# ZIMPL needs more work _ this version doesn't even seem to fit lpsolve55 ..
#Source10: http://personales.upv.es/arodrigu/SolverWS/descargas/xli_ZIMPL.zip
#Source10-MD5: 274645d82a31bc9f7ffc8b758811c285
#Source10ExtractDir: lp_solve_%type_raw[maj]/xli/xli_ZIMPL
-# 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 (even from the build-dir) in 4.14)
Source11: mirror:gnu:glpk/glpk-%type_raw[glpk].tar.gz
-Source11-MD5: d1e7142be353da423ee4662499813541
+Source11-MD5: f2ac7013bc0420d730d052e7ba24bdb1
#
SourceDirectory: lp_solve_%type_raw[maj]
+PatchFile: lpsolve.patch
+PatchFile-MD5: f27f7a5dbd1d2411e2b83ac7db502bf9
PatchScript: <<
#!/bin/sh -ev
+N=lpsolve
+v=%v
+p=%p
+b=%b
+t=%type_raw[maj]
+. %{PatchFile}
+
#### ZIMPL
# sed -r -e 's,CPLEX,ZIMPL,' -e "s,^(src=).*,\1'lp_ZIMPL.c'," <
xli/xli_CPLEX/ccc > xli/xli_ZIMPL/ccc
#### the ccc files
@@ -67,6 +73,16 @@
s,\-I\.\./\.\./,-I%p/include/lpsolve/,g
s,\-I\.\./\.\.,-I%p/include/lpsolve &,
}" */*/ccc
+# SpaceChars is used :
+ sed -ri -e '/static char SpaceChars/{ i */
+ a /*
+ }' xli/xli_DIMACS/lp_Dimacs.c
+# Else plenty of errors "'struct _lprec' has no member named 'lpfunc'" in
those 2 complilations :
+ sed -ri -e '/RELEASE/s,0,2,' xli/xli_DIMACS/lp_{Dimacs,network}.c
+# No xli_glpsql.c to be found _ neither in the buildir, nor on my machine, nor
on the net..
+# Let is provisionally replace it by a compilation of glpsql.c; but this needs
a real include-dir for mysql:
+ sed -ri -e 's,/usr,%p,' -e 's,xli_glpsql,${glpkdir}/src/glpsql,'
xli/xli_MathProg/ccc
+
#### glpk
# the bfp would still build with glpk-4.14, given the following changes _ but
would still require
# a special build of glpk, installing a number of headers that have become
internal _ not worth it.
@@ -75,45 +91,22 @@
# # link the bfp with glpk (4.14) instead of re-compiling:
# perl -pi.bak -e 's, \$\{glpk\},,; s,I\$\{glpkdir\},I%p,; s,\-Wl,-L%p/lib
-lglpk $&,' bfp/bfp_GLPK/ccc
# for xli_MathProg, use the downloaded glpk-4.13 :
- perl -pi -e 's,=/glpk,=%b/../glpk-%type_raw[glpk],'
{bfp/bfp_GLPK,xli/xli_MathProg}/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
- rm -f xli/*/xli_* bfp/*/bfp_* */*/c*.bat */*.bat
-#### from lpsolve pkg _ just to be sure to use identical files :
- ## Dynamic library filenames on OS X end with ".dylib", not ".so". Also,
give full path for dlopen.
- perl -pi.bak -e 's,liblpsolve%type_pkg[maj].so,%p/lib/liblpsolve.dylib,'
lp_explicit.h
-## hard-code the paths to the modules, for the user's convenience (preserving
the possibility to specify
-## a full path, absolute or relative), since fink doesn't give us a decent
DYLD(_FALLBACK)_LIBRARY_PATH...
- perl -pi.bak -e "s:( +) strcat\(((bfp|xli)name), \".so\"\);:$&\n\1char
finklib[127]=\"%p/lib/\";
-\1if(strrchr(\2,'/') != NULL) finklib[0]=0;
-\1strcat(finklib,\2);:;
- s:(dlopen\().*name:\1finklib:" lp_lib.c
-# Use vecLib :
- sed -i.bak -e
's,myBLAS,/System/Library/Frameworks/Accelerate.framework/Frameworks/vecLib.framework/Versions/Current/libBLAS.dylib,'
lp_lib.h
- sed -i.bak -e '/WIN32/,/endif/{
- /WIN32/d
- /endif/d
- }' bfp/bfp_LUSOL/lp_LUSOL.h
- sed -i.bak -e '/3, "\.so"/,+1{
- s,3,6,
- s,so,dylib,
- }' shared/{commonlib,myblas}.c
-# make the .bat scripts usable
- sed -ri -e 's,^del,rm,' -e 's,\r$,,' -e '/^rem /d' lp_rlp.bat */*/*.bat
+ perl -pi -e 's,=/glpk.*,=%b/../glpk-%type_raw[glpk],'
{bfp/bfp_GLPK,xli/xli_MathProg}/ccc
<<
CompileScript: <<
#!/bin/sh -ev
export PATH=%p/lib/flex/bin:$PATH
export CPATH=%p/lib/flex/include:%p/include
export LIBRARY_PATH=%p/lib/flex/lib:%p/lib
+# skip bfp_GLPK for the moment :
+ sed -i '1i return 0' bfp/bfp_GLPK/ccc
+
for d in xli/xli_CPLEX xli/xli_LINDO; do cd $d; . ./*.bat; cd -; done
for d in bfp xli; do \
cd $d
D=`echo $d|tr "[:lower:]" "[:upper:]"`
sed -r -e '/EXPORTS/d' -e 's,^ +,_,' < lp_$D.def > exp_sym
- for n in ${d}_*; do cd $n; sh -ev ccc; cd -; done
+ for n in ${d}_*; do cd $n; . ./ccc; cd -; done
cd ..
done
<<
--- NEW FILE: lpsolve.patch ---
## patchscript common with first part of that of lpsolve-extra, for ease of
maintenance
# try for last digit of 'current version' the (hex) sum of the last 2 'digits'
of %v (hopefully the next to last stays 0..)
comp_v=`sed -e 's,\.[^.]*$,,' <<<"$v"`
M=`sed -e 's,.*\.,,' <<<"$comp_v"`
m=`sed -e 's,.*\.,,' <<<"$v"`
cv=$(( 16*$M + $m ))
curr_v="$t.$cv"
T=`sed -e 's,\.,,g' <<<"$t"`
## for stripping:
echo '__mh_execute_header' > symlst
### The ccc files:
## add return statement, to allow for sh -ev. Also, use %b instead of /tmp, to
avoid collisions with parallel builds.
## and simplify things by not putting output in a "bin/$PLATFORM" subdir
sed -i.bak -e "/printf/{s,main,int &,
s,;,;return 0;,}
s,/tmp,$b,g
s,-l(m|dl),,
s,bin/.PLATFORM/,,
/bin\/.PLATFORM/d" `find . -name ccc`
## no strict-aliasing for the lib, since it gives a warning in lp_matrix.c
2357-2358)
sed -i'' -e "{
/fpic/d
s;-shared.*;*.o -dynamiclib -Wl,-x -dead_strip -exported_symbols_list
../exp_sym -compatibility_version $comp_v -current_version $curr_v -o
lib${N}.$v.dylib -install_name $p/lib/lib${N}.$t.dylib;
/^ar /c ar rc lib${N}.$v.a *.o
s,$T,.$v,
}" ${N}$T/ccc
## for executable, use -mdynamic-no-pic, and strip. Also, link with the library:
sed -i'' -e "{
# use -Os here, since far from time-critical code.
s,-O3,-Os -fstrict-aliasing -Wall,
s;\$src.*;-mdynamic-no-pic -Wl,-x -dead_strip -exported_symbols_list
../symlst lp_solve.c ../${N}$T/lib${N}.dylib -o lp_solve;
}" lp_solve/ccc
## Dynamic library filenames on darwin end with ".dylib", not ".so". Also, give
full install_name for dlopen.
sed -i'' -e "s,lib${N}$T.so,$p/lib/lib${N}.$t.dylib," lp_explicit.h
## hard-code the paths to the modules, for the user's convenience (preserving
the possibility to specify
## a full path, absolute or relative), to avoid using a
DYLD(_FALLBACK)_LIBRARY_PATH...
sed -ri.bak -e "s:( +) strcat\(((bfp|xli)name), \".so\"\);:&\n\1char
finklib[128]=\"$p/lib/\";\n\
\1if(strrchr(\2,'/') != NULL) finklib[0]='\\\0';\n\
\1strcat(finklib,\2);:" \
-e "s:(dlopen\().*name:\1finklib:" lp_lib.c
# Use vecLib :
sed -i.bak -e
's;myBLAS;/System/Library/Frameworks/Accelerate.framework/Frameworks/vecLib.framework/Versions/Current/libBLAS.dylib;'
lp_lib.h
# avoid implicit declaration of isspace
sed -i.bak -e '1i #include <ctype.h>' lp_solve/lp_solve.c
#
sed -i.bak -e '/WIN32/,/endif/{
/WIN32/d
/endif/d
}' bfp/bfp_LUSOL/lp_LUSOL.h
sed -i.bak -e '/3, "\.so"/,+1{
s,3,6,
s,so,dylib,
}' shared/{commonlib,myblas}.c
## if one wanted to remove all srcs compiled here from lpsolve-extra, one would
need to uncomment the next 2 lines:
# tr ' ' '\n'<<<"allocINT createLink firstActiveLink is_nativeBLAS load_BLAS
nextActiveLink removeLink sortByINT\
# daxpy dscal idamax init_BLAS unload_BLAS allocREAL timeNow freeLink
allocCHAR"|sed -r -e 's,^, ,' >> lp_solve.def
# this would cost 596 bytes in the size of the lib, and for the so's:
# GLPK, CPLEX, LINDO: +4, LUSOL -3860, etaPFI +120, DIMACS, MathProg: -
# Thus: not worthwhile (at least not till default bfp and xli are taken out of
the lib...)
## rm irrelevant files
rm -f xli/*/xli_* bfp/*/bfp_* */*/c*.bat */*.bat */.DS_Store
## turn the .bat scripts into usable shell scripts
find . -name '*.bat' | xargs sed -i.bak -e 's,^del,rm,' -e 's,\r$,,' -e
'/^rem /d'
Index: lpsolve-octave.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/lpsolve-octave.info,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- lpsolve-octave.info 12 Jul 2010 21:50:04 -0000 1.19
+++ lpsolve-octave.info 18 Jul 2011 23:01:14 -0000 1.20
@@ -1,25 +1,25 @@
Info2: <<
Package: lpsolve-octave
-Version: 5.5.0.13
-Revision: 6
+Version: 5.5.2.0
+Revision: 1
## It is probably prudent to rev-up and change the next line whenever octave
or lpsolve go to a new version
## (to quickly check things are OK after a change, run from within octave the
files in %p/share/doc/lpsolve-octave/examples)
Type: octave (3.0.5), maj (5.5)
BuildDepends: fftw3, hdf5, libncurses5, lpsolve%type_raw[maj]-dev (>= %v-1),
readline5
Depends: <<
-fftw3-shlibs, hdf5-shlibs, libncurses5-shlibs, lpsolve%type_raw[maj]-shlibs
(>= %type_raw[maj].0.0-1),
+fftw3-shlibs, hdf5-shlibs, libncurses5-shlibs, lpsolve%type_raw[maj]-shlibs
(>= %v-1),
octave (>= %type_raw[octave]-3) | octave-atlas (>= %type_raw[octave]-3),
octave (<< %type_raw[octave]-9999) | octave-atlas (<<
%type_raw[octave]-9999), readline5-shlibs
<<
Source: mirror:sourceforge:lpsolve/lp_solve_%v_octave_source.tar.gz
-Source-MD5: 06327362f8360281049ab0b72a33dc47
+Source-MD5: b8ea22788d119bcd514d057a74f4c430
SourceDirectory: lp_solve_%type_raw[maj]
PatchScript: <<
- perl -pi -e 's,malloc\.h,stdlib.h,' */*/*/hash.c
- perl -pi -e 's,\.\./\.\./\.\.,%p/include/lpsolve,; s:\*\.o:$& -Wl,-x
-Wl,-dead_strip:' */*/*/ccc
- perl -pi -e 's,liblpsolve%type_pkg[maj]\.so,%p/lib/liblpsolve.dylib,'
*/*/*/lp_explicit.h
+ sed -i'' -e '/malloc\.h/d' */*/*/hash.c
+ sed -i'' -e 's,\.\./\.\./\.\.,%p/include/lpsolve,' -e 's:\*\.o:& -Wl,-x
-Wl,-dead_strip:' */*/*/ccc
+ sed -i'' -e 's,liblpsolve%type_pkg[maj]\.so,%p/lib/liblpsolve.dylib,'
*/*/*/lp_explicit.h
<<
CompileScript: echo ''
InstallScript: <<
Index: lpsolve-python.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/lpsolve-python.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- lpsolve-python.info 4 Aug 2008 00:14:42 -0000 1.6
+++ lpsolve-python.info 18 Jul 2011 23:01:14 -0000 1.7
@@ -1,21 +1,27 @@
Info2: <<
Package: lpsolve-python
-Version: 5.5.0.13
+Version: 5.5.2.0
Revision: 1
## rev-up and change next line at every new version of python (or lpsolve)
-Type: python (2.5), maj (5.5)
+Type: python (2.7), maj (5.5)
+# no numpy for python3 ...
-BuildDepends: lpsolve%type_raw[maj]-dev (>= %v-1), python%type_pkg[python]
+BuildDepends: lpsolve%type_raw[maj]-dev (>= %v-1), python%type_pkg[python],
numpy-py%type_pkg[python]
Depends: lpsolve%type_raw[maj]-shlibs (>= %type_raw[maj].0.0-1),
python%type_pkg[python]
Source: mirror:sourceforge:lpsolve/lp_solve_%v_Python_source.tar.gz
-Source-MD5: a65490540d2e3d6de8638389ace8c298
+Source-MD5: feda6b55a62f877557f49e04b091191c
SourceDirectory: lp_solve_%type_raw[maj]
PatchScript: <<
+#!/bin/sh -ev
rm -f */*/*.bat
- perl -pi -e 's,malloc\.h,stdlib.h,' */*/hash.c
- perl -pi -e 's,\.\./\.\./lpsolve%type_pkg[maj],%p/lib,;
s,(\["lpsolve)%type_pkg[maj],\1,; s,\.\./\.\.,%p/include/lpsolve,'
extra/Python/setup.py
+ sed -i'' -e '/malloc\.h/d' */*/hash.c
+ sed -i'' -e 's,5.5.0.[59],%v,' \
+ -e 's,/Lib,/lib/python%type_raw[python],' \
+ -e "s,\.\./\.\./lpsolve%type_pkg[maj].*,%p/lib'," \
+ -e 's,\(\["lpsolve\)%type_pkg[maj],\1,' \
+ -e 's,\.\./\.\.,%p/include/lpsolve,' extra/Python/setup.py
<<
CompileScript: echo ''
InstallScript: <<
Index: lpsolve.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/lpsolve.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- lpsolve.info 31 Aug 2010 22:36:31 -0000 1.14
+++ lpsolve.info 18 Jul 2011 23:01:13 -0000 1.15
@@ -2,68 +2,27 @@
Package: lpsolve
Description: Mixed Integer Linear Programming (ILP) solver
Type: maj (5.5)
-Version: 5.5.0.13
+Version: 5.5.2.0
Revision: 1
-BuildDepends: sed | ssed, bison, flex-devel
+BuildDepends: sed | ssed, bison, flex-devel, fink (>= 0.24.12)
Depends: %N%type_raw[maj]-shlibs (= %v-%r)
Suggests: lpsolve-extra
Source: mirror:sourceforge:%n/lp_solve_%v_source.tar.gz
-Source-MD5: e8e71b1bf86267597d5776ab0f69721d
+Source-MD5: 167c0fb4ab178e0b7ab50bf0a635a836
SourceDirectory: lp_solve_%type_raw[maj]
+PatchFile: %{Ni}.patch
+PatchFile-MD5: f27f7a5dbd1d2411e2b83ac7db502bf9
PatchScript: <<
#!/bin/sh -ev
-# try for last digit of 'current version' the (hex) sum of the last 2 'digits'
of %v (hopefully the next to last stays 0..)
-comp_v=`sed -e 's,\.[^.]*$,,' <<<'%v'`
-M=`sed -e 's,.*\.,,' <<<"$comp_v"`
-m=`sed -e 's,.*\.,,' <<<"%v"`
-cv=$(( 16*$M + $m ))
-curr_v="%type_raw[maj].$cv"
-## no strict-aliasing for the lib, since it gives a warning in lp_matrix.c
2357-2358)
- sed -i.bak -e "{
- /fpic/d
- s;\-shared.*;*.o -dynamiclib -single_module -Wl,-x -dead_strip
-exported_symbols_list ../exp_sym -compatibility_version $comp_v
-current_version $curr_v -o lib%N.%v.dylib -install_name
%p/lib/lib%N.%type_raw[maj].dylib;
- s,ar rv,ar rc,
- /ranlib/d
- s,%type_pkg[maj],.%v,
- }" %N%type_pkg[maj]/ccc
-## for executable, use -mdynamic-no-pic, and strip. Also, link with the
library:
- sed -i.bak -e '{
-# should use -Os here, since far from time-critical code, but the resulting
size would be identical...
- s,\-O3,& -fstrict-aliasing -Wall,
- s,\$src.*,-mdynamic-no-pic -s -dead_strip lp_solve.c
../%N%type_pkg[maj]/lib%N.dylib -o lp_solve,
- }' lp_solve/ccc
-## Dynamic library filenames on darwin end with ".dylib", not ".so". Also,
give full path for dlopen.
- perl -pi.bak -e 's,lib%N%type_pkg[maj].so,%p/lib/lib%N.dylib,' lp_explicit.h
-## hard-code the paths to the modules, for the user's convenience (preserving
the possibility to specify
-## a full path, absolute or relative), since fink doesn't give us a decent
DYLD(_FALLBACK)_LIBRARY_PATH...
- perl -pi.bak -e "s:( +) strcat\(((bfp|xli)name), \".so\"\);:$&\n\1char
finklib[127]=\"%p/lib/\";
-\1if(strrchr(\2,'/') != NULL) finklib[0]=0;
-\1strcat(finklib,\2);:;
- s:(dlopen\().*name:\1finklib:" lp_lib.c
-# Use vecLib :
- sed -i.bak -e
's;myBLAS;/System/Library/Frameworks/Accelerate.framework/Frameworks/vecLib.framework/Versions/Current/libBLAS.dylib;'
lp_lib.h
-# avoid implicit declaration of isspace
- sed -i.bak -e '1i #include <ctype.h>' lp_solve/lp_solve.c
-#
- sed -i.bak -e '/WIN32/,/endif/{
- /WIN32/d
- /endif/d
- }' bfp/bfp_LUSOL/lp_LUSOL.h
- sed -i.bak -e '/3, "\.so"/,+1{
- s,3,6,
- s,so,dylib,
- }' shared/{commonlib,myblas}.c
-## if one wanted to remove all srcs compiled here from lpsolve-extra, one
would need to uncomment the next 2 lines:
-# tr ' ' '\n'<<<"allocINT createLink firstActiveLink is_nativeBLAS load_BLAS
nextActiveLink removeLink sortByINT\
-# daxpy dscal idamax init_BLAS unload_BLAS allocREAL timeNow freeLink
allocCHAR"|sed -r -e 's,^, ,' >> lp_solve.def
-# this would cost 596 bytes in the size of the lib, and for the so's:
-# GLPK, CPLEX, LINDO: +4, LUSOL -3860, etaPFI +120, DIMACS, MathProg: -
-# Thus: not worthwhile (at least not till default bfp and xli are taken out of
the lib...)
-# make the .bat script usable
- sed -ri -e 's,^del,rm,' -e 's,\r$,,' -e '/^rem /d' lp_rlp.bat
+N=%N
+v=%v
+p=%p
+b=%b
+t=%type_raw[maj]
+. %{PatchFile}
<<
CompileScript: <<
@@ -77,7 +36,7 @@
# Build the library
sed -r -e '/EXPORTS/d' -e 's,^ +,_,' < lp_solve.def > exp_sym
cd %N%type_pkg[maj]
- sh -ev ccc
+ . ./ccc
# Symbolic links to library
ln -s lib%N.%v.dylib lib%N.%type_raw[maj].dylib
@@ -86,7 +45,7 @@
# Build the lp_solve executable
cd ../lp_solve
- sh -ev ccc
+ . ./ccc
<<
InstallScript: <<
@@ -100,7 +59,7 @@
mkdir -p %i/include/%N/bfp/bfp_LUSOL/LUSOL
mkdir -p %i/include/%N/colamd
mkdir -p %i/include/%N/shared
- cp *.{h,def} %i/include/%N
+ cp *.h %i/include/%N
cp bfp/*.h %i/include/%N/bfp
cp bfp/bfp_LUSOL/*.h %i/include/%N/bfp/bfp_LUSOL
cp bfp/bfp_LUSOL/LUSOL/*.h %i/include/%N/bfp/bfp_LUSOL/LUSOL
@@ -123,8 +82,8 @@
SplitOff: <<
Package: %N%type_raw[maj]-shlibs
Files: lib/lib%N.*.dylib
- Shlibs: %p/lib/lib%N.%type_raw[maj].dylib 5.5.0 %n (>= 5.5.0.0-1)
- DocFiles: README.txt
+ Shlibs: %p/lib/lib%N.%type_raw[maj].dylib 5.5.2 %n (>= 5.5.0.0-1)
+ DocFiles: README.txt lp_solve.def
<<
SplitOff2: <<
@@ -159,7 +118,7 @@
of '-s' and '-gfull' in the compile stage :
-fno-common, -single-module: 601776
-fno-common, multiple-modules: 609436
-common; -single-module: 601832
+common; -single-module: 601832 (vers 5.5.2: 544096 32bit, 536768 64bit)
[Above figures from before using the exported_symbols_list; now size=509400,
and adding -DINTEGERTIME would gain an additional 32 bytes, and -fno-common
56]
------------------------------------------------------------------------------
Storage Efficiency Calculator
This modeling tool is based on patent-pending intellectual property that
has been used successfully in hundreds of IBM storage optimization engage-
ments, worldwide. Store less, Store more with what you own, Move data to
the right place. Try It Now! http://www.accelacomm.com/jaw/sfnl/114/51427378/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
