[62152] trunk/dports/math/lp_solve
ryandesign at macports.org
ryandesign at macports.org
Tue Dec 29 23:46:36 PST 2009
Revision: 62152
http://trac.macports.org/changeset/62152
Author: ryandesign at macports.org
Date: 2009-12-29 23:46:33 -0800 (Tue, 29 Dec 2009)
Log Message:
-----------
lp_solve: update to 5.5.0.15 and support ${configure.build_arch}
Modified Paths:
--------------
trunk/dports/math/lp_solve/Portfile
trunk/dports/math/lp_solve/files/Makefile
trunk/dports/math/lp_solve/files/patch-CC.diff
trunk/dports/math/lp_solve/files/patch-Wno-long-double.diff
Modified: trunk/dports/math/lp_solve/Portfile
===================================================================
--- trunk/dports/math/lp_solve/Portfile 2009-12-30 07:33:15 UTC (rev 62151)
+++ trunk/dports/math/lp_solve/Portfile 2009-12-30 07:46:33 UTC (rev 62152)
@@ -3,8 +3,7 @@
PortSystem 1.0
name lp_solve
-version 5.5.0.13
-revision 1
+version 5.5.0.15
set branch [join [lrange [split ${version} .] 0 1] .]
categories math
platforms darwin
@@ -23,9 +22,9 @@
distname ${name}_${version}_source
worksrcdir ${name}_${branch}
-checksums md5 e8e71b1bf86267597d5776ab0f69721d \
- sha1 ddad2f7aabfcc9c9998800c09b4a3d27fca7138f \
- rmd160 63ffd2df25bde0c7ca5da4fba4140a8fb97b0495
+checksums md5 2408c94893394f832469661c16b9f0d0 \
+ sha1 e4b80684e8c1fe996b6bc90c01ce5cf022d9ccfe \
+ rmd160 2a7d43c3c0627a49e03f9e1924932f0f0441e011
post-extract {
xinstall -m 644 ${filespath}/Makefile ${worksrcpath}
@@ -36,15 +35,25 @@
use_configure no
-build.args CC=${configure.cc}
+build.args CC="${configure.cc} ${configure.cc_archflags}"
destroot {
- xinstall -m 755 -W ${worksrcpath}/lpsolve55 \
+ switch ${configure.build_arch} {
+ x86_64 -
+ ppc64 {
+ set bits 64
+ }
+ i386 -
+ ppc {
+ set bits 32
+ }
+ }
+ xinstall -m 755 -W ${worksrcpath}/lpsolve55/bin/osx${bits} \
liblpsolve55.a liblpsolve55.dylib ${destroot}${prefix}/lib
- xinstall -m 755 -W ${worksrcpath}/lp_solve \
+ xinstall -m 755 -W ${worksrcpath}/lp_solve/bin/osx${bits} \
lp_solve ${destroot}${prefix}/bin
xinstall -m 755 -d ${destroot}${prefix}/include/lpsolve
- eval xinstall -m 444 [glob ${worksrcpath}/*.h] \
+ eval xinstall -m 644 [glob ${worksrcpath}/*.h] \
${destroot}${prefix}/include/lpsolve/
}
Modified: trunk/dports/math/lp_solve/files/Makefile
===================================================================
--- trunk/dports/math/lp_solve/files/Makefile 2009-12-30 07:33:15 UTC (rev 62151)
+++ trunk/dports/math/lp_solve/files/Makefile 2009-12-30 07:46:33 UTC (rev 62152)
@@ -7,4 +7,4 @@
all: $(SUBDIRS)
$(SUBDIRS):
- cd "$@" && c=$(CC) sh ./ccc.osx
+ cd "$@" && c="$(CC)" sh ./ccc.osx
Modified: trunk/dports/math/lp_solve/files/patch-CC.diff
===================================================================
--- trunk/dports/math/lp_solve/files/patch-CC.diff 2009-12-30 07:33:15 UTC (rev 62151)
+++ trunk/dports/math/lp_solve/files/patch-CC.diff 2009-12-30 07:46:33 UTC (rev 62152)
@@ -1,32 +1,34 @@
--- demo/ccc.osx 2005-06-11 15:27:44.000000000 -0500
-+++ demo/ccc.osx 2009-12-30 01:21:35.000000000 -0600
++++ demo/ccc.osx 2009-12-30 01:14:47.000000000 -0600
@@ -1,5 +1,4 @@
src='../bfp/lp_MDO.c ../commonlib.c ../myblas.c ../colamd/colamd.c ../ini.c ../fortify.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_etaPFI/lp_etaPFI.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 demo.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-c=cc
math=-lm
---- lp_solve/ccc.osx 2005-06-11 15:27:38.000000000 -0500
-+++ lp_solve/ccc.osx 2009-12-30 01:21:34.000000000 -0600
-@@ -1,5 +1,4 @@
+--- lp_solve/ccc.osx 2009-01-25 12:39:09.000000000 -0600
++++ lp_solve/ccc.osx 2009-12-30 01:14:46.000000000 -0600
+@@ -1,6 +1,5 @@
+ :
src='../lp_MDO.c ../shared/commonlib.c ../colamd/colamd.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_solve.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-c=cc
- math=-lm
-
---- lpsolve55/ccc.osx 2005-06-23 16:53:08.000000000 -0500
-+++ lpsolve55/ccc.osx 2009-12-30 01:21:33.000000000 -0600
-@@ -1,5 +1,4 @@
+ #determine platform (32/64 bit)
+ >/tmp/platform.c
+--- lpsolve55/ccc.osx 2009-08-09 10:36:19.000000000 -0500
++++ lpsolve55/ccc.osx 2009-12-30 01:14:45.000000000 -0600
+@@ -1,6 +1,5 @@
+ :
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
- def=
- so=
---- lpsolve55/cccLUSOL.osx 2005-06-23 16:53:18.000000000 -0500
-+++ lpsolve55/cccLUSOL.osx 2009-12-30 01:21:32.000000000 -0600
+ #determine platform (32/64 bit)
+ >/tmp/platform.c
+--- lpsolve55/cccLUSOL.osx 2009-01-25 12:39:54.000000000 -0600
++++ lpsolve55/cccLUSOL.osx 2009-12-30 01:14:43.000000000 -0600
@@ -1,5 +1,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 ../bfp/bfp_LUSOL/lusol.c'
-c=cc
- def=
- so=
+ #determine platform (32/64 bit)
+ >/tmp/platform.c
Modified: trunk/dports/math/lp_solve/files/patch-Wno-long-double.diff
===================================================================
--- trunk/dports/math/lp_solve/files/patch-Wno-long-double.diff 2009-12-30 07:33:15 UTC (rev 62151)
+++ trunk/dports/math/lp_solve/files/patch-Wno-long-double.diff 2009-12-30 07:46:33 UTC (rev 62152)
@@ -1,6 +1,5 @@
-diff -ur before/configure lp_solve_5.5/configure
---- configure 2008-07-21 14:10:03.000000000 -0400
-+++ configure 2008-11-17 00:01:48.000000000 -0500
+--- configure 2009-08-04 17:22:58.000000000 -0500
++++ configure 2009-12-30 01:29:33.000000000 -0600
@@ -1357,7 +1357,7 @@
linux)
CCSHARED="-fPIC";;
@@ -10,9 +9,8 @@
;;
OpenUNIX*|UnixWare*)
DEF='-dy -DNOLONGLONG'
-diff -ur before/configure.ac lp_solve_5.5/configure.ac
---- configure.ac 2008-07-21 14:10:17.000000000 -0400
-+++ configure.ac 2008-11-17 00:01:55.000000000 -0500
+--- configure.ac 2009-01-02 12:15:34.000000000 -0600
++++ configure.ac 2009-12-30 01:29:33.000000000 -0600
@@ -21,7 +21,7 @@
linux)
CCSHARED="-fPIC";;
@@ -22,9 +20,8 @@
;;
OpenUNIX*|UnixWare*)
DEF='-dy -DNOLONGLONG'
-diff -ur before/demo/ccc.osx lp_solve_5.5/demo/ccc.osx
---- demo/ccc.osx 2005-06-11 16:27:44.000000000 -0400
-+++ demo/ccc.osx 2008-11-17 00:02:06.000000000 -0500
+--- demo/ccc.osx 2005-06-11 15:27:44.000000000 -0500
++++ demo/ccc.osx 2009-12-30 01:29:33.000000000 -0600
@@ -9,6 +9,6 @@
else dl=-ldl
fi
@@ -33,38 +30,35 @@
+opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME'
$c -I.. -I../bfp -I../bfp/bfp_etaPFI -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP $src -o demo $math $dl
-diff -ur before/lp_solve/ccc.osx lp_solve_5.5/lp_solve/ccc.osx
---- lp_solve/ccc.osx 2005-06-11 16:27:38.000000000 -0400
-+++ lp_solve/ccc.osx 2008-11-17 00:02:22.000000000 -0500
-@@ -9,6 +9,6 @@
- else dl=-ldl
- fi
+--- lp_solve/ccc.osx 2009-01-25 12:39:09.000000000 -0600
++++ lp_solve/ccc.osx 2009-12-30 01:29:33.000000000 -0600
+@@ -31,6 +31,6 @@
+ def=
+ dl=-ldl
-opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME -Wno-long-double'
+opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME'
- $c -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -o lp_solve $math $dl
-diff -ur before/lpsolve55/ccc.osx lp_solve_5.5/lpsolve55/ccc.osx
---- lpsolve55/ccc.osx 2005-06-23 17:53:08.000000000 -0400
-+++ lpsolve55/ccc.osx 2008-11-17 00:02:38.000000000 -0500
-@@ -9,7 +9,7 @@
- so=y
- fi
+ $c -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -o bin/$PLATFORM/lp_solve $math $dl
+--- lpsolve55/ccc.osx 2009-08-09 10:36:19.000000000 -0500
++++ lpsolve55/ccc.osx 2009-12-30 01:29:33.000000000 -0600
+@@ -30,7 +30,7 @@
+ dl=-ldl
+ so=y
-opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME -Wno-long-double'
+opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME'
- $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
- libtool -static -o liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
-diff -ur before/lpsolve55/cccLUSOL.osx lp_solve_5.5/lpsolve55/cccLUSOL.osx
---- lpsolve55/cccLUSOL.osx 2005-06-23 17:53:18.000000000 -0400
-+++ lpsolve55/cccLUSOL.osx 2008-11-17 00:02:42.000000000 -0500
-@@ -9,7 +9,7 @@
- so=y
- fi
+ $c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
+ libtool -static -o bin/$PLATFORM/liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
+--- lpsolve55/cccLUSOL.osx 2009-01-25 12:39:54.000000000 -0600
++++ lpsolve55/cccLUSOL.osx 2009-12-30 01:29:33.000000000 -0600
+@@ -30,7 +30,7 @@
+ dl=-ldl
+ so=y
-opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME -Wno-long-double'
+opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME'
- $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
- libtool -static -o liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
+ $c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
+ libtool -static -o bin/$PLATFORM/liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091229/5f2ff3d3/attachment.html>
More information about the macports-changes
mailing list