diff --git a/lpsolve/.SRCINFO b/lpsolve/.SRCINFO new file mode 100644 index 0000000000..799ecc1518 --- /dev/null +++ b/lpsolve/.SRCINFO @@ -0,0 +1,16 @@ +pkgbase = lpsolve + pkgdesc = a Mixed Integer Linear Programming (MILP) solver + pkgver = 5.5.2.11 + pkgrel = 3 + url = http://lpsolve.sourceforge.net/ + arch = x86_64 + license = LGPL-2.1-or-later + license = GPL-2.0-or-later WITH Bison-exception-2.2 + license = BSD-3-Clause + depends = glibc + source = https://downloads.sourceforge.net/project/lpsolve/lpsolve/5.5.2.11/lp_solve_5.5.2.11_source.tar.gz + source = lpsolve-5.5.2.11-misc.patch + sha256sums = 6d4abff5cc6aaa933ae8e6c17a226df0fc0b671c438f69715d41d09fe81f902f + sha256sums = ac1fc22a94318189c53c83fd728bd2a6c97ae2680308a852880842f78a0536c5 + +pkgname = lpsolve diff --git a/lpsolve/.nvchecker.toml b/lpsolve/.nvchecker.toml new file mode 100644 index 0000000000..ffafb6a55e --- /dev/null +++ b/lpsolve/.nvchecker.toml @@ -0,0 +1,4 @@ +[lpsolve] +source = "regex" +regex = "lp_solve_(\\d+.\\d+.\\d+.\\d+)" +url = "https://lpsolve.sourceforge.net/5.5/distribution.htm" diff --git a/lpsolve/PKGBUILD b/lpsolve/PKGBUILD index fcae6970b1..08abf6895b 100644 --- a/lpsolve/PKGBUILD +++ b/lpsolve/PKGBUILD @@ -5,24 +5,23 @@ pkgname=lpsolve _origname=lp_solve pkgver=5.5.2.11 _mainver=5.5 -pkgrel=2 +pkgrel=3 pkgdesc="a Mixed Integer Linear Programming (MILP) solver" arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) url="http://lpsolve.sourceforge.net/" # no https -license=('LGPL2.1') +license=('LGPL-2.1-or-later' + 'GPL-2.0-or-later WITH Bison-exception-2.2' + 'BSD-3-Clause') depends=('glibc') -options=(!distcc) source=(https://downloads.sourceforge.net/project/lpsolve/lpsolve/${pkgver}/lp_solve_${pkgver}_source.tar.gz - flags.patch) -sha1sums=('c0ffa7b8d49938ba213b4d3e894d56b3aba4e983' - '6fb51fcc2d821f3ca16b0da9e93cf211abafcde2') + lpsolve-5.5.2.11-misc.patch) sha256sums=('6d4abff5cc6aaa933ae8e6c17a226df0fc0b671c438f69715d41d09fe81f902f' - '2d374f905a31c17769f52ca57d0e41f39bbe71e84a28f7ab972a63cf380bf14b') + 'ac1fc22a94318189c53c83fd728bd2a6c97ae2680308a852880842f78a0536c5') prepare() { cd ${_origname}_${_mainver} - # add CFLAGS/LDFLAGS - patch -Np1 -i "$srcdir"/flags.patch + # Gentoo patch to fix build and include flags fixes + patch -Np1 -i "$srcdir"/lpsolve-5.5.2.11-misc.patch } build() { @@ -31,7 +30,8 @@ build() { # taken from Fedora spec cd lpsolve55 sh -x ccc -# rm bin/ux*/liblpsolve55.a + rm bin/ux*/liblpsolve55.a + cd ../lp_solve sh -x ccc } @@ -43,4 +43,6 @@ package() { install -m755 lp_solve/bin/ux*/lp_solve "${pkgdir}"/usr/bin/ install -m755 lpsolve55/bin/ux*/liblpsolve55.so "${pkgdir}"/usr/lib/ install -m644 lp*.h "${pkgdir}"/usr/include/lpsolve/ + + install -D -m644 README.txt -t "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/lpsolve/flags.patch b/lpsolve/flags.patch deleted file mode 100644 index 16b10820fe..0000000000 --- a/lpsolve/flags.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -ru lp_solve_5.5.orig/lp_solve/ccc lp_solve_5.5/lp_solve/ccc ---- lp_solve_5.5.orig/lp_solve/ccc 2009-02-23 16:31:18.000000000 +0000 -+++ lp_solve_5.5/lp_solve/ccc 2009-02-23 16:31:29.000000000 +0000 -@@ -28,7 +28,7 @@ - fi - rm /tmp/isnan.c /tmp/isnan >/dev/null 2>&1 - --opts='-O3' -+opts=$CFLAGS - - def= - if [ "$PLATFORM" = "SCO_UNIX" ] ---- lp_solve_5.5/lp_solve/ccc 2021-05-16 11:21:48.000000000 +0200 -+++ lp_solve_5.5/lp_solve/ccc.new 2021-05-16 11:24:49.707197134 +0200 -@@ -42,4 +42,4 @@ - else dl=-ldl - 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 -+$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 $LDFLAGS -o bin/$PLATFORM/lp_solve $math $dl - -diff -ru lp_solve_5.5.orig/lpsolve55/ccc lp_solve_5.5/lpsolve55/ccc ---- lp_solve_5.5.orig/lpsolve55/ccc 2009-02-23 16:31:18.000000000 +0000 -+++ lp_solve_5.5/lpsolve55/ccc 2009-02-23 16:31:29.000000000 +0000 -@@ -35,7 +35,7 @@ - so=y - fi - --opts='-O3' -+opts=$CFLAGS - - $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 - ar rv bin/$PLATFORM/liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` - ---- lp_solve_5.5/lpsolve55/ccc 2021-05-16 11:11:40.000000000 +0200 -+++ lp_solve_5.5/lpsolve55/ccc.new 2021-05-16 11:19:13.556599115 +0200 -@@ -48,7 +48,7 @@ - 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 $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -- $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o bin/$PLATFORM/liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl -+ $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so $LDFLAGS -o bin/$PLATFORM/liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl - fi - - rm *.o 2>/dev/null diff --git a/lpsolve/lpsolve-5.5.2.0.defines.patch b/lpsolve/lpsolve-5.5.2.0.defines.patch deleted file mode 100644 index a325c13703..0000000000 --- a/lpsolve/lpsolve-5.5.2.0.defines.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- lp_solve_5.5/lpsolve55/ccc -+++ lp_solve_5.5/lpsolve55/ccc -@@ -18,7 +18,7 @@ - echo '#include '>>/tmp/isnan.c - echo '#include '>>/tmp/isnan.c - echo '#include '>>/tmp/isnan.c --echo 'main(){isnan(0);}'>>/tmp/isnan.c -+echo 'main(){isnan(0.0);}'>>/tmp/isnan.c - $c /tmp/isnan.c -o /tmp/isnan $math >/dev/null 2>&1 - if [ $? = 0 ] - then NOISNAN= ---- lp_solve_5.5/lp_solve/ccc -+++ lp_solve_5.5/lp_solve/ccc -@@ -20,7 +20,7 @@ - echo '#include '>>/tmp/isnan.c - echo '#include '>>/tmp/isnan.c - echo '#include '>>/tmp/isnan.c --echo 'main(){isnan(0);}'>>/tmp/isnan.c -+echo 'main(){isnan(0.0);}'>>/tmp/isnan.c - $c /tmp/isnan.c -o /tmp/isnan $math >/dev/null 2>&1 - if [ $? = 0 ] - then NOISNAN= diff --git a/lpsolve/lpsolve-5.5.2.11-misc.patch b/lpsolve/lpsolve-5.5.2.11-misc.patch new file mode 100644 index 0000000000..b4e1f91f72 --- /dev/null +++ b/lpsolve/lpsolve-5.5.2.11-misc.patch @@ -0,0 +1,335 @@ +--- a/bfp/bfp_LUSOL/ccc ++++ b/bfp/bfp_LUSOL/ccc +@@ -1,13 +1,13 @@ + : + src='../../shared/commonlib.c ../../colamd/colamd.c lp_LUSOL.c ../../lp_utils.c ../../shared/myblas.c LUSOL/lusol.c' + +-c=cc ++c=${CC:-cc} + + #determine platform (32/64 bit) + >/tmp/platform.c + echo '#include '>>/tmp/platform.c + echo '#include '>>/tmp/platform.c +-echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>/tmp/platform.c ++echo 'int main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>/tmp/platform.c + $c /tmp/platform.c -o /tmp/platform + PLATFORM=`/tmp/platform` + rm /tmp/platform /tmp/platform.c >/dev/null 2>&1 +--- a/bfp/bfp_LUSOL/ccc.osx ++++ b/bfp/bfp_LUSOL/ccc.osx +@@ -1,13 +1,13 @@ + : + src='../../shared/commonlib.c ../../colamd/colamd.c lp_LUSOL.c ../../lp_utils.c ../../shared/myblas.c LUSOL/lusol.c' + +-c=cc ++c=${CC:-cc} + + #determine platform (32/64 bit) + >/tmp/platform.c + echo '#include '>>/tmp/platform.c + echo '#include '>>/tmp/platform.c +-echo 'main(){printf("osx%d", (int) (sizeof(void *)*8));}'>>/tmp/platform.c ++echo 'int main(){printf("osx%d", (int) (sizeof(void *)*8));}'>>/tmp/platform.c + $c /tmp/platform.c -o /tmp/platform + PLATFORM=`/tmp/platform` + rm /tmp/platform /tmp/platform.c >/dev/null 2>&1 +--- a/demo/ccc ++++ b/demo/ccc +@@ -1,6 +1,5 @@ + src='../lp_MDO.c ../shared/commonlib.c ../colamd/colamd.c ../shared/mmio.c ../shared/myblas.c ../ini.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 +- ++c=${CC:-cc} + math=-lm + + def= +--- a/demo/ccc.osx ++++ b/demo/ccc.osx +@@ -1,5 +1,5 @@ + 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 ++c=${CC:-cc} + + math=-lm + +--- a/lp_solve/ccc ++++ b/lp_solve/ccc +@@ -1,6 +1,6 @@ + : + 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 ++c=${CC:-cc} + + MYTMP=`mktemp -d "${TMPDIR:-/tmp}"/lp_solve_XXXXXX` + +@@ -8,7 +8,7 @@ MYTMP=`mktemp -d "${TMPDIR:-/tmp}"/lp_solve_XXXXXX` + >"$MYTMP"/platform.c + echo '#include '>>"$MYTMP"/platform.c + echo '#include '>>"$MYTMP"/platform.c +-echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>"$MYTMP"/platform.c ++echo 'int main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>"$MYTMP"/platform.c + $c "$MYTMP"/platform.c -o "$MYTMP"/platform + PLATFORM=`"$MYTMP"/platform` + rm "$MYTMP"/platform "$MYTMP"/platform.c >/dev/null 2>&1 +@@ -22,7 +22,7 @@ math=-lm + echo '#include '>>"$MYTMP"/isnan.c + echo '#include '>>"$MYTMP"/isnan.c + echo '#include '>>"$MYTMP"/isnan.c +-echo 'main(){isnan(0.0);return 0;}'>>"$MYTMP"/isnan.c ++echo 'int main(){isnan(0.0);return 0;}'>>"$MYTMP"/isnan.c + $c "$MYTMP"/isnan.c -o "$MYTMP"/isnan $math >/dev/null 2>&1 + if [ $? = 0 ] + then NOISNAN= +@@ -42,4 +42,4 @@ then opts='-O0' + else dl=-ldl + 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 ++$c $CFLAGS $LDFLAGS -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 +--- a/lp_solve/ccc.osx ++++ b/lp_solve/ccc.osx +@@ -1,6 +1,6 @@ + : + 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 ++c=${CC:-cc} + + MYTMP=`mktemp -d "${TMPDIR:-/tmp}"/lp_solve_XXXXXX` + +@@ -8,7 +8,7 @@ MYTMP=`mktemp -d "${TMPDIR:-/tmp}"/lp_solve_XXXXXX` + >"$MYTMP"/platform.c + echo '#include '>>"$MYTMP"/platform.c + echo '#include '>>"$MYTMP"/platform.c +-echo 'main(){printf("osx%d", (int) (sizeof(void *)*8));}'>>"$MYTMP"/platform.c ++echo 'int main(){printf("osx%d", (int) (sizeof(void *)*8));}'>>"$MYTMP"/platform.c + $c "$MYTMP"/platform.c -o "$MYTMP"/platform + PLATFORM=`"$MYTMP"/platform` + rm "$MYTMP"/platform "$MYTMP"/platform.c >/dev/null 2>&1 +@@ -22,7 +22,7 @@ math=-lm + echo '#include '>>"$MYTMP"/isnan.c + echo '#include '>>"$MYTMP"/isnan.c + echo '#include '>>"$MYTMP"/isnan.c +-echo 'main(){isnan(0.0);return 0;}'>>"$MYTMP"/isnan.c ++echo 'int main(){isnan(0.0);return 0;}'>>"$MYTMP"/isnan.c + $c "$MYTMP"/isnan.c -o "$MYTMP"/isnan $math >/dev/null 2>&1 + if [ $? = 0 ] + then NOISNAN= +@@ -37,4 +37,4 @@ dl=-ldl + + opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME -Wno-long-double' + +-$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 ++$c $CFLAGS $LDFLAGS -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 +--- a/lpsolve55/ccc ++++ b/lpsolve55/ccc +@@ -1,6 +1,6 @@ + : + 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 ++c=${CC:-cc} + + MYTMP=`mktemp -d "${TMPDIR:-/tmp}"/lp_solve_XXXXXX` + +@@ -8,7 +8,7 @@ MYTMP=`mktemp -d "${TMPDIR:-/tmp}"/lp_solve_XXXXXX` + >"$MYTMP"/platform.c + echo '#include '>>"$MYTMP"/platform.c + echo '#include '>>"$MYTMP"/platform.c +-echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>"$MYTMP"/platform.c ++echo 'int main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>"$MYTMP"/platform.c + $c "$MYTMP"/platform.c -o "$MYTMP"/platform + PLATFORM=`"$MYTMP"/platform` + rm "$MYTMP"/platform "$MYTMP"/platform.c >/dev/null 2>&1 +@@ -20,7 +20,7 @@ mkdir bin bin/$PLATFORM >/dev/null 2>&1 + echo '#include '>>"$MYTMP"/isnan.c + echo '#include '>>"$MYTMP"/isnan.c + echo '#include '>>"$MYTMP"/isnan.c +-echo 'main(){isnan(0.0);return 0;}'>>"$MYTMP"/isnan.c ++echo 'int main(){isnan(0.0);return 0;}'>>"$MYTMP"/isnan.c + $c "$MYTMP"/isnan.c -o "$MYTMP"/isnan $math >/dev/null 2>&1 + if [ $? = 0 ] + then NOISNAN= +@@ -42,13 +42,13 @@ fi + opts='-O3' + + $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 +-ar rv bin/$PLATFORM/liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` +-ranlib bin/$PLATFORM/liblpsolve55.a ++${AR:-ar} rv bin/$PLATFORM/liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` ++${RANLIB:-ranlib} bin/$PLATFORM/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 $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src +- $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o bin/$PLATFORM/liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl ++ $c $CFLAGS $LDFLAGS -fpic -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src ++ $c $CFLAGS $LDFLAGS -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o bin/$PLATFORM/liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl + fi + + rm *.o 2>/dev/null +--- a/lpsolve55/ccc.aix ++++ b/lpsolve55/ccc.aix +@@ -4,14 +4,14 @@ src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../in + type xlc >/dev/null 2>&1 + if [ $? = 0 ] + then c=xlc +-else c=cc ++else c=${CC:-cc} + fi + + #determine platform (32/64 bit) + >/tmp/platform.c + echo '#include '>>/tmp/platform.c + echo '#include '>>/tmp/platform.c +-echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>/tmp/platform.c ++echo 'int main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>/tmp/platform.c + $c /tmp/platform.c -o /tmp/platform + PLATFORM=`/tmp/platform` + rm /tmp/platform /tmp/platform.c >/dev/null 2>&1 +@@ -23,7 +23,7 @@ mkdir bin bin/$PLATFORM >/dev/null 2>&1 + echo '#include '>>/tmp/isnan.c + echo '#include '>>/tmp/isnan.c + echo '#include '>>/tmp/isnan.c +-echo 'main(){isnan(0.0);return 0;}'>>/tmp/isnan.c ++echo 'int main(){isnan(0.0);return 0;}'>>/tmp/isnan.c + $c /tmp/isnan.c -o /tmp/isnan $math >/dev/null 2>&1 + if [ $? = 0 ] + then NOISNAN= +@@ -38,8 +38,8 @@ so=y + opts='-O2' + + $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 +-ar rv bin/$PLATFORM/liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` +-ranlib bin/$PLATFORM/liblpsolve55.a ++${AR:-ar} rv bin/$PLATFORM/liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` ++${RANLIB:-ranlib} bin/$PLATFORM/liblpsolve55.a + + if [ "$so" != "" ] + then +--- a/lpsolve55/ccc.hp-ux ++++ b/lpsolve55/ccc.hp-ux +@@ -1,12 +1,12 @@ + : + 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 ++c=${CC:-cc} + + #determine platform (32/64 bit) + >/tmp/platform.c + echo '#include '>>/tmp/platform.c + echo '#include '>>/tmp/platform.c +-echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>/tmp/platform.c ++echo 'int main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>/tmp/platform.c + $c /tmp/platform.c -o /tmp/platform + PLATFORM=`/tmp/platform` + rm /tmp/platform /tmp/platform.c >/dev/null 2>&1 +@@ -18,7 +18,7 @@ mkdir bin bin/$PLATFORM >/dev/null 2>&1 + echo '#include '>>/tmp/isnan.c + echo '#include '>>/tmp/isnan.c + echo '#include '>>/tmp/isnan.c +-echo 'main(){isnan(0.0);return 0;}'>>/tmp/isnan.c ++echo 'int main(){isnan(0.0);return 0;}'>>/tmp/isnan.c + $c /tmp/isnan.c -o /tmp/isnan $math >/dev/null 2>&1 + if [ $? = 0 ] + then NOISNAN= +@@ -33,8 +33,8 @@ so=y + opts='-O3' + + $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 +-ar rv bin/$PLATFORM/liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` +-ranlib bin/$PLATFORM/liblpsolve55.a ++${AR:-ar} rv bin/$PLATFORM/liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` ++${RANLIB:-ranlib} bin/$PLATFORM/liblpsolve55.a + + if [ "$so" != "" ] + then +--- a/lpsolve55/ccc.osx ++++ b/lpsolve55/ccc.osx +@@ -1,6 +1,6 @@ + : + 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 ++c=${CC:-cc} + + MYTMP=`mktemp -d "${TMPDIR:-/tmp}"/lp_solve_XXXXXX` + +@@ -8,7 +8,7 @@ MYTMP=`mktemp -d "${TMPDIR:-/tmp}"/lp_solve_XXXXXX` + >"$MYTMP"/platform.c + echo '#include '>>"$MYTMP"/platform.c + echo '#include '>>"$MYTMP"/platform.c +-echo 'main(){printf("osx%d", (int) (sizeof(void *)*8));}'>>"$MYTMP"/platform.c ++echo 'int main(){printf("osx%d", (int) (sizeof(void *)*8));}'>>"$MYTMP"/platform.c + $c "$MYTMP"/platform.c -o "$MYTMP"/platform + PLATFORM=`"$MYTMP"/platform` + rm "$MYTMP"/platform "$MYTMP"/platform.c >/dev/null 2>&1 +@@ -20,7 +20,7 @@ mkdir bin bin/$PLATFORM >/dev/null 2>&1 + echo '#include '>>"$MYTMP"/isnan.c + echo '#include '>>"$MYTMP"/isnan.c + echo '#include '>>"$MYTMP"/isnan.c +-echo 'main(){isnan(0.0);return 0;}'>>"$MYTMP"/isnan.c ++echo 'int main(){isnan(0.0);return 0;}'>>"$MYTMP"/isnan.c + $c "$MYTMP"/isnan.c -o "$MYTMP"/isnan $math >/dev/null 2>&1 + if [ $? = 0 ] + then NOISNAN= +--- a/lpsolve55/ccc.solaris ++++ b/lpsolve55/ccc.solaris +@@ -1,12 +1,12 @@ + : + 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 ++c=${CC:-cc} + + #determine platform (32/64 bit) + >/tmp/platform.c + echo '#include '>>/tmp/platform.c + echo '#include '>>/tmp/platform.c +-echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>/tmp/platform.c ++echo 'int main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>/tmp/platform.c + $c /tmp/platform.c -o /tmp/platform + PLATFORM=`/tmp/platform` + rm /tmp/platform /tmp/platform.c >/dev/null 2>&1 +@@ -18,7 +18,7 @@ mkdir bin bin/$PLATFORM >/dev/null 2>&1 + echo '#include '>>/tmp/isnan.c + echo '#include '>>/tmp/isnan.c + echo '#include '>>/tmp/isnan.c +-echo 'main(){isnan(0.0);return 0;}'>>/tmp/isnan.c ++echo 'int main(){isnan(0.0);return 0;}'>>/tmp/isnan.c + $c /tmp/isnan.c -o /tmp/isnan $math >/dev/null 2>&1 + if [ $? = 0 ] + then NOISNAN= +@@ -33,8 +33,8 @@ so=y + opts='-O3' + + $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 +-ar rv bin/$PLATFORM/liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` +-ranlib bin/$PLATFORM/liblpsolve55.a ++${AR:-ar} rv bin/$PLATFORM/liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` ++${RANLIB:-ranlib} bin/$PLATFORM/liblpsolve55.a + + if [ "$so" != "" ] + then +--- a/lpsolve55/cccLUSOL.osx ++++ b/lpsolve55/cccLUSOL.osx +@@ -1,11 +1,11 @@ + 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 ++c=${CC:-cc} + + #determine platform (32/64 bit) + >/tmp/platform.c + echo '#include '>>/tmp/platform.c + echo '#include '>>/tmp/platform.c +-echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>/tmp/platform.c ++echo 'int main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>/tmp/platform.c + $c /tmp/platform.c -o /tmp/platform + PLATFORM=`/tmp/platform` + rm /tmp/platform /tmp/platform.c >/dev/null 2>&1 +@@ -17,7 +17,7 @@ mkdir bin bin/$PLATFORM >/dev/null 2>&1 + echo '#include '>>/tmp/isnan.c + echo '#include '>>/tmp/isnan.c + echo '#include '>>/tmp/isnan.c +-echo 'main(){isnan(0.0);return 0;}'>>/tmp/isnan.c ++echo 'int main(){isnan(0.0);return 0;}'>>/tmp/isnan.c + $c /tmp/isnan.c -o /tmp/isnan $math >/dev/null 2>&1 + if [ $? = 0 ] + then NOISNAN=