[packages/lp_solve] - updated to 5.5.2.11 - updated shared patch to use also CC and LDFLAGS - switched to SuiteSparse-CO
qboosh
qboosh at pld-linux.org
Sun Jan 15 18:25:53 CET 2023
commit 7fbf0dc45cf153a5de193eaa85a7f3b022dc560a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Jan 15 18:27:03 2023 +0100
- updated to 5.5.2.11
- updated shared patch to use also CC and LDFLAGS
- switched to SuiteSparse-COLAMD completely
lp_solve-shared.patch | 36 ++++++++++++++++++------------------
lp_solve.spec | 25 +++++++++++++++----------
2 files changed, 33 insertions(+), 28 deletions(-)
---
diff --git a/lp_solve.spec b/lp_solve.spec
index 907f082..e5b4053 100644
--- a/lp_solve.spec
+++ b/lp_solve.spec
@@ -1,21 +1,20 @@
-%define _ver_major 5.5
-%define _ver_minor 2.5
+%define ver_major 5.5
+%define ver_minor 2.11
Summary: Mixed Integer Linear Program solver
Summary(pl.UTF-8): Biblioteka i narzędzie do rozwiązywania problemu programowania liniowego
Name: lp_solve
-Version: %{_ver_major}.%{_ver_minor}
-Release: 3
+Version: %{ver_major}.%{ver_minor}
+Release: 1
License: LGPL
Group: Libraries
Source0: http://downloads.sourceforge.net/lpsolve/%{name}_%{version}_source.tar.gz
-# Source0-md5: 3be57261fc41dd8e210f54017220d5f7
+# Source0-md5: a829a8d9c60ff81dc72ff52363703886
Patch0: %{name}-shared.patch
Patch1: %{name}-define.patch
URL: http://lpsolve.sourceforge.net/5.5/
-BuildRequires: COLAMD-devel
+BuildRequires: SuiteSparse-COLAMD-devel
BuildRequires: bison
BuildRequires: flex
-BuildRequires: libtool
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -87,7 +86,7 @@ Static liblpsolve library.
Statyczna biblioteka liblpsolve.
%prep
-%setup -q -n %{name}_%{_ver_major}
+%setup -q -n %{name}_%{ver_major}
%patch0 -p1
%patch1 -p1
@@ -95,9 +94,15 @@ Statyczna biblioteka liblpsolve.
%build
cd lpsolve55
-CC="%{__cc}" CFLAGS="%{rpmcflags} %{rpmcppflags} -I/usr/include/colamd -I/usr/include/suitesparse" sh -x ccc
+CC="%{__cc}" \
+CFLAGS="%{rpmcflags} %{rpmcppflags} -I/usr/include/suitesparse" \
+LDFLAGS="%{rpmcppflags}" \
+sh -x ccc
cd ../lp_solve
-CC="%{__cc}" CFLAGS="%{rpmcflags} %{rpmcppflags} -I/usr/include/colamd -I/usr/include/suitesparse" sh -x ccc
+CC="%{__cc}" \
+CFLAGS="%{rpmcflags} %{rpmcppflags} -I/usr/include/suitesparse" \
+LDFLAGS="%{rpmcppflags}" \
+sh -x ccc
%install
rm -rf $RPM_BUILD_ROOT
diff --git a/lp_solve-shared.patch b/lp_solve-shared.patch
index eadd2c2..9be7f46 100644
--- a/lp_solve-shared.patch
+++ b/lp_solve-shared.patch
@@ -1,5 +1,5 @@
---- lp_solve_5.5/lpsolve55/ccc.orig 2009-03-25 01:27:18.000000000 +0100
-+++ lp_solve_5.5/lpsolve55/ccc 2011-03-19 06:51:52.141343390 +0100
+--- lp_solve_5.5/lpsolve55/ccc.orig 2020-11-23 17:27:40.000000000 +0100
++++ lp_solve_5.5/lpsolve55/ccc 2023-01-15 17:41:26.595725363 +0100
@@ -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'
@@ -7,9 +7,9 @@
+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}
- #determine platform (32/64 bit)
- >/tmp/platform.c
-@@ -35,16 +35,16 @@
+ MYTMP=`mktemp -d "${TMPDIR:-/tmp}"/lp_solve_XXXXXX`
+
+@@ -39,16 +39,16 @@ else dl=-ldl
so=y
fi
@@ -17,7 +17,7 @@
+opts=${CFLAGS:--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
-+$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
++$c -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL $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
@@ -25,13 +25,13 @@
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 -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -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 -lcolamd
++ $c -fPIC -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I. $opts $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
++ $c $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 -lcolamd
fi
rm *.o 2>/dev/null
---- lp_solve_5.5/lp_solve/ccc.orig 2009-01-25 19:39:03.000000000 +0100
-+++ lp_solve_5.5/lp_solve/ccc 2011-03-19 06:51:37.585343390 +0100
+--- lp_solve_5.5/lp_solve/ccc.orig 2020-11-23 17:27:17.000000000 +0100
++++ lp_solve_5.5/lp_solve/ccc 2023-01-15 17:46:34.940721581 +0100
@@ -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'
@@ -39,20 +39,20 @@
+src='lp_solve.c'
+c=${CC:-cc}
- #determine platform (32/64 bit)
- >/tmp/platform.c
-@@ -28,7 +28,7 @@
+ MYTMP=`mktemp -d "${TMPDIR:-/tmp}"/lp_solve_XXXXXX`
+
+@@ -30,7 +30,7 @@ else NOISNAN=-DNOISNAN
fi
- rm /tmp/isnan.c /tmp/isnan >/dev/null 2>&1
+ rm "$MYTMP"/isnan.c "$MYTMP"/isnan >/dev/null 2>&1
-opts='-O3'
+opts=${CFLAGS:--O3}
- def=
- if [ "$PLATFORM" = "SCO_UNIX" ]
-@@ -38,4 +38,4 @@
+ rmdir "$MYTMP"
+
+@@ -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 -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../shared $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -o bin/$PLATFORM/lp_solve $math $dl -L../lpsolve55/bin/$PLATFORM -llpsolve55
++$c $LDFLAGS -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../shared $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -o bin/$PLATFORM/lp_solve $math $dl -L../lpsolve55/bin/$PLATFORM -llpsolve55
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lp_solve.git/commitdiff/7fbf0dc45cf153a5de193eaa85a7f3b022dc560a
More information about the pld-cvs-commit
mailing list