community/lrs to 072-1

This commit is contained in:
Kevin Mihelich 2022-03-31 13:18:52 +00:00
parent 001817ca66
commit 859d0b2b95
2 changed files with 13 additions and 48 deletions

View file

@ -1,25 +1,25 @@
--- makefile.orig 2021-06-04 10:48:58.746663307 -0600 --- makefile.orig 2022-03-31 07:06:10.873873950 -0600
+++ makefile 2021-06-04 11:03:59.777040326 -0600 +++ makefile 2022-03-31 07:08:04.717729216 -0600
@@ -8,10 +8,10 @@ @@ -8,10 +8,10 @@
#try uncommenting next line if cc is the default C compiler #try uncommenting next line if cc is the default C compiler
#CC = gcc CC = gcc # or gcc7
-default: lrs lrsgmp -default: lrs lrsgmp lrsnash checkpred inedel
+#default: lrs lrsgmp +#default: lrs lrsgmp lrsnash checkpred inedel
#choose line below instead if __int128 not supported #choose line below instead if __int128 not supported
-#default: lrs64 lrsgmp -#default: lrs64 lrsgmp
+default: lrs64 lrsgmp +default: lrs64 lrsgmp
#make lrs lrs,lrsgmp hybrid and gmp versions #make lrs lrs,lrsgmp hybrid and gmp versions
@@ -47,12 +47,12 @@ #make lrs64 lrs,lrsgmp compilers without 128 bit support
@@ -45,12 +45,12 @@
# for 32 bit machines # for 32 bit machines
-# BITS=-DB32 -# BITS=
-# MPLRSOBJ2= -# MPLRSOBJ2=
+BITS=-DB32 +BITS=
+MPLRSOBJ2= +MPLRSOBJ2=
# for 64 bit machines # for 64 bit machines
@ -30,42 +30,7 @@
LRSOBJ=lrs.o lrslong1.o lrslong2.o lrslib1.o lrslib2.o lrslibgmp.o lrsgmp.o lrsdriver.o LRSOBJ=lrs.o lrslong1.o lrslong2.o lrslib1.o lrslib2.o lrslibgmp.o lrsgmp.o lrsdriver.o
@@ -171,14 +171,14 @@ @@ -216,11 +216,11 @@
single: lrs.c lrslong.c lrslong.h lrslib.c lrslib.h lrsgmp.c lrsgmp.h lrsdriver.h lrsdriver.c
$(CC) ${CFLAGS} -DSAFE -DLRSLONG -o lrs1 lrs.c lrslib.c lrslong.c lrsdriver.c
- $(CC) ${CFLAGS} ${BITS} -DSAFE -DLRSLONG -o lrs2 lrs.c lrslib.c lrslong.c lrsdriver.c
+ #$(CC) ${CFLAGS} ${BITS} -DSAFE -DLRSLONG -o lrs2 lrs.c lrslib.c lrslong.c lrsdriver.c
ln -s -f lrs1 redund1
ln -s -f lrs2 redund2
allmp: lrs.c lrslib.c lrslib.h lrsmp.c lrsmp.h lrsdriver.h lrsdriver.c
$(CC) -Wall -O3 -o lrs lrs.c lrslib.c lrsdriver.c lrsmp.c
$(CC) -Wall -O3 -DSAFE -DLRSLONG -o lrs1 lrs.c lrslib.c lrsdriver.c lrslong.c
- $(CC) -Wall -O3 -DSAFE -DLRSLONG ${BITS} -o lrs2 lrs.c lrslib.c lrsdriver.c lrslong.c
+ #$(CC) -Wall -O3 -DSAFE -DLRSLONG ${BITS} -o lrs2 lrs.c lrslib.c lrsdriver.c lrslong.c
$(CC) -O3 -DLRS_QUIET -o lrsnash lrsnash.c lrsnashlib.c lrslib.c lrsdriver.c lrsmp.c -static
$(CC) -O3 -o setnash setupnash.c lrslib.c lrsdriver.c lrsmp.c
$(CC) -O3 -o setnash2 setupnash2.c lrslib.c lrsdriver.c lrsmp.c
@@ -194,7 +194,7 @@
lrsnash: lrsnash.c nashdemo.c lrsnashlib.c lrslib.c lrsnashlib.h lrslib.h lrsgmp.c lrsgmp.h lrslong.h lrsdriver.h lrsdriver.c
$(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o lrsnashgmp lrsnash.c lrsnashlib.c lrslib.c lrsgmp.c lrsdriver.c -lgmp -DGMP
$(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o lrsnash1 lrsnash.c lrsnashlib.c lrslib.c lrslong.c lrsdriver.c -DLRSLONG -DSAFE
- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o lrsnash2 lrsnash.c lrsnashlib.c lrslib.c lrslong.c lrsdriver.c -DLRSLONG -DSAFE ${BITS}
+ #$(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o lrsnash2 lrsnash.c lrsnashlib.c lrslib.c lrslong.c lrsdriver.c -DLRSLONG -DSAFE ${BITS}
$(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o nashdemo nashdemo.c lrsnashlib.c lrslib.c lrsgmp.c lrsdriver.c -lgmp -DGMP
$(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o 2nash 2nash.c
cp lrsnashgmp lrsnash
@@ -202,7 +202,7 @@
fel: fel.c lrslib.h lrslib.c lrsgmp.h lrsgmp.c lrslong.c
$(CC) -O3 -Wall -DGMP -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrsgmp.c -L${LIBDIR} -lgmp -o felgmp
$(CC) -O3 -Wall -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrslong.c -L${LIBDIR} -DLRSLONG -DSAFE -o fel1
- $(CC) -O3 -Wall -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrslong.c -L${LIBDIR} -DLRSLONG -DSAFE ${BITS} -o fel2
+ #$(CC) -O3 -Wall -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrslong.c -L${LIBDIR} -DLRSLONG -DSAFE ${BITS} -o fel2
######################################################################
# From here on the author is David Bremner <bremner@unb.ca> to whom you should turn for help
@@ -213,11 +213,11 @@
SHLIB ?=$(SONAME)$(SOMINOR) SHLIB ?=$(SONAME)$(SOMINOR)
SHLINK ?=liblrs.so SHLINK ?=liblrs.so

View file

@ -4,7 +4,7 @@
# - patch to fix up makefile for 32-bit builds # - patch to fix up makefile for 32-bit builds
pkgname=lrs pkgname=lrs
pkgver=071.b pkgver=072
_pkgver=${pkgver/./} _pkgver=${pkgver/./}
pkgrel=1 pkgrel=1
pkgdesc='C implementation of the reverse search algorithm for vertex enumeration/convex hull problems' pkgdesc='C implementation of the reverse search algorithm for vertex enumeration/convex hull problems'
@ -15,9 +15,9 @@ depends=(gmp)
source=(http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/lrslib-$_pkgver.tar.gz source=(http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/lrslib-$_pkgver.tar.gz
lrs-system-cflags.patch lrs-system-cflags.patch
32-bit-support.patch) 32-bit-support.patch)
sha256sums=('df22682cd742315fe04f866cfe4804d5950f7dc7f514d5b5f36f5b7f5aff9188' sha256sums=('fc48754a1ded1d8445d40ecfbe3546e4f27d53aaee95dc2c8c0c79fb9cd532f0'
'617ed06ae2584ef3349a3b1f6ab1a4acd11f18211394458498e1223a65bb0e73' '617ed06ae2584ef3349a3b1f6ab1a4acd11f18211394458498e1223a65bb0e73'
'6d04500e37d1917ad64e86195f47b05425ae1b6ba2bbbddd78166af10d2327a8') '9d8ae8d964c7f2342cdeab105776963aea5d7e20db656b0e87b0290593859dc9')
prepare() { prepare() {
cd lrslib-$_pkgver cd lrslib-$_pkgver