[arch-commits] Commit in lpsolve/trunk (4 files)
Andreas Radke
andyrtr at archlinux.org
Sun May 16 09:31:46 UTC 2021
Date: Sunday, May 16, 2021 @ 09:31:45
Author: andyrtr
Revision: 415586
upgpkg: lpsolve 5.5.2.11-1: upstream update 5.5.2.11; make sure to also apply LDFLAGS
Added:
lpsolve/trunk/flags.patch
(from rev 415585, lpsolve/trunk/cflags.patch)
Modified:
lpsolve/trunk/PKGBUILD
Deleted:
lpsolve/trunk/cflags.patch
lpsolve/trunk/lpsolve-5.5.2.0.defines.patch
-------------------------------+
PKGBUILD | 18 ++++++----------
cflags.patch | 25 ----------------------
flags.patch | 45 ++++++++++++++++++++++++++++++++++++++++
lpsolve-5.5.2.0.defines.patch | 22 -------------------
4 files changed, 52 insertions(+), 58 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-05-16 09:17:34 UTC (rev 415585)
+++ PKGBUILD 2021-05-16 09:31:45 UTC (rev 415586)
@@ -2,9 +2,9 @@
pkgname=lpsolve
_origname=lp_solve
-pkgver=5.5.2.5
+pkgver=5.5.2.11
_mainver=5.5
-pkgrel=4
+pkgrel=1
pkgdesc="a Mixed Integer Linear Programming (MILP) solver"
arch=('x86_64')
url="http://lpsolve.sourceforge.net/" # no https
@@ -11,18 +11,14 @@
license=('LGPL2.1')
depends=('glibc')
source=(https://downloads.sourceforge.net/project/lpsolve/lpsolve/${pkgver}/lp_solve_${pkgver}_source.tar.gz
- cflags.patch
- lpsolve-5.5.2.0.defines.patch)
-sha1sums=('232ce8edb073c7c9b6d9100abf77038d989c45c8'
- '47285b11ef146ddb9aacfff982370ab7b0ea245e'
- 'c4e61302072adcd27aba5d966e33fa001f3599e2')
+ flags.patch)
+sha1sums=('c0ffa7b8d49938ba213b4d3e894d56b3aba4e983'
+ '6fb51fcc2d821f3ca16b0da9e93cf211abafcde2')
prepare() {
cd ${_origname}_${_mainver}
- # add CFLAGS
- patch -Np1 -i "$srcdir"/cflags.patch
- # by Fedora
- patch -Np1 -i "$srcdir"/lpsolve-5.5.2.0.defines.patch
+ # add CFLAGS/LDFLAGS
+ patch -Np1 -i "$srcdir"/flags.patch
}
build() {
Deleted: cflags.patch
===================================================================
--- cflags.patch 2021-05-16 09:17:34 UTC (rev 415585)
+++ cflags.patch 2021-05-16 09:31:45 UTC (rev 415586)
@@ -1,25 +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" ]
-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'`
-
Copied: lpsolve/trunk/flags.patch (from rev 415585, lpsolve/trunk/cflags.patch)
===================================================================
--- flags.patch (rev 0)
+++ flags.patch 2021-05-16 09:31:45 UTC (rev 415586)
@@ -0,0 +1,45 @@
+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
Deleted: lpsolve-5.5.2.0.defines.patch
===================================================================
--- lpsolve-5.5.2.0.defines.patch 2021-05-16 09:17:34 UTC (rev 415585)
+++ lpsolve-5.5.2.0.defines.patch 2021-05-16 09:31:45 UTC (rev 415586)
@@ -1,22 +0,0 @@
---- lp_solve_5.5/lpsolve55/ccc
-+++ lp_solve_5.5/lpsolve55/ccc
-@@ -18,7 +18,7 @@
- echo '#include <stdio.h>'>>/tmp/isnan.c
- echo '#include <stdlib.h>'>>/tmp/isnan.c
- echo '#include <math.h>'>>/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 <stdio.h>'>>/tmp/isnan.c
- echo '#include <stdlib.h>'>>/tmp/isnan.c
- echo '#include <math.h>'>>/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=
More information about the arch-commits
mailing list