added community/lrs

This commit is contained in:
Kevin Mihelich 2019-07-09 13:55:24 +00:00
parent 1749c45d90
commit 6815b8e172
3 changed files with 128 additions and 0 deletions

View file

@ -0,0 +1,54 @@
From d820f5c88bea19ba23e4d603d6d9369dd2b525ee Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 9 Jul 2019 07:45:26 -0600
Subject: [PATCH] 32-bit changes
---
makefile | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/makefile b/makefile
index 06b115c..37e4185 100644
--- a/makefile
+++ b/makefile
@@ -8,10 +8,10 @@
#try uncommenting next line if cc is the default C compiler
#CC = gcc
-default: lrs redund lrsgmp redundgmp
+#default: lrs redund lrsgmp redundgmp
#choose line below instead if __int128 not supported
-#default: lrs64 redund64 lrsgmp redundgmp
+default: lrs64 redund64 lrsgmp redundgmp
#make lrs lrs,lrsgmp redund,redundgmp hybrid and gmp versions
@@ -195,7 +195,7 @@ SOMINOR ?=.0.0
SHLIB ?=$(SONAME)$(SOMINOR)
SHLINK ?=liblrs.so
-SHLIBOBJ=lrslong1-shr.o lrslong2-shr.o lrslib1-shr.o lrslib2-shr.o \
+SHLIBOBJ=lrslong1-shr.o lrslib1-shr.o \
lrslibgmp-shr.o lrsgmp-shr.o lrsdriver-shr.o
SHLIBBIN=lrs-shared redund-shared lrsnash-shared
@@ -215,11 +215,11 @@ ${SHLINK}: ${SONAME}
all-shared: ${SHLIBBIN}
-lrs-shared: ${SHLINK} lrs.o
- $(CC) lrs.o -o $@ -L . -llrs ${LDFLAGS}
+lrs-shared: ${SHLINK} lrs64.o
+ $(CC) lrs64.o -o $@ -L . -llrs ${LDFLAGS}
-redund-shared: ${SHLINK} redund.o
- $(CC) redund.o -o $@ -L . -llrs ${LDFLAGS}
+redund-shared: ${SHLINK} redund64.o
+ $(CC) redund64.o -o $@ -L . -llrs ${LDFLAGS}
lrsnash-shared: ${SHLINK} lrsnash.c
$(CC) -DGMP -DMA lrsnash.c lrsnashlib.c -I${INCLUDEDIR} -o $@ -L . -llrs -lgmp ${LDFLAGS}
--
2.21.0

38
community/lrs/PKGBUILD Normal file
View file

@ -0,0 +1,38 @@
# Maintainer: Antonio Rojas <arojas@archlinux.org>
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - patch to fix up makefile for 32-bit builds
pkgname=lrs
pkgver=070.a
_pkgver=${pkgver/./}
pkgrel=1
pkgdesc="C implementation of the reverse search algorithm for vertex enumeration/convex hull problems"
arch=(x86_64)
url="http://cgm.cs.mcgill.ca/~avis/C/lrs.html"
license=(GPL)
depends=(gmp)
source=("http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/lrslib-$_pkgver.tar.gz"
lrs-system-cflags.patch
0001-32-bit-changes.patch)
sha256sums=('1d7ef659588343906e53ec7b88e7d481faa8f4249a3adca871d5a2d8d8737366'
'23814d543e458f43b9871f5de6112f3ca331d8ded3449c7e2efa681ca5a6606f'
'af8dee8dffc5483a87f77401e5ac8c41d7506c9dfb202d07ad81dc0396846f4a')
prepare() {
cd lrslib-$_pkgver
patch -p1 -i ../lrs-system-cflags.patch # Use system CFLAGS/LDFLAGS
if [[ $CARCH != "aarch64" ]]; then
patch -p1 -i ../0001-32-bit-changes.patch
fi
}
build() {
cd lrslib-$_pkgver
make -j1
}
package() {
cd lrslib-$_pkgver
make DESTDIR="$pkgdir" prefix=/usr install
}

View file

@ -0,0 +1,36 @@
--- lrslib-070/makefile.orig 2019-04-29 11:53:55.707113154 +0000
+++ lrslib-070/makefile 2019-04-29 11:55:36.485187714 +0000
@@ -35,7 +35,6 @@
#INCLUDEDIR = /usr/local/include:/usr/include
#LIBDIR = /usr/local/lib:/usr/lib
-CFLAGS = -O3 -Wall
SHLIB_CFLAGS = -fPIC
mpicxx=mpic++
@@ -204,7 +203,7 @@
# Building (linking) the shared library, and relevant symlinks.
${SHLIB}: ${SHLIBOBJ}
- $(CC) -shared -Wl,-soname=$(SONAME) $(SHLIBFLAGS) -o $@ ${SHLIBOBJ} -lgmp
+ $(CC) -shared -Wl,-soname=$(SONAME) $(SHLIBFLAGS) -o $@ ${SHLIBOBJ} -lgmp ${LDFLAGS}
${SONAME}: ${SHLIB}
ln -sf ${SHLIB} ${SONAME}
@@ -217,13 +216,13 @@
all-shared: ${SHLIBBIN}
lrs-shared: ${SHLINK} lrs.o
- $(CC) lrs.o -o $@ -L . -llrs
+ $(CC) lrs.o -o $@ -L . -llrs ${LDFLAGS}
redund-shared: ${SHLINK} redund.o
- $(CC) redund.o -o $@ -L . -llrs
+ $(CC) redund.o -o $@ -L . -llrs ${LDFLAGS}
lrsnash-shared: ${SHLINK} lrsnash.c
- $(CC) -DGMP -DMA lrsnash.c lrsnashlib.c -I${INCLUDEDIR} -o $@ -L . -llrs -lgmp
+ $(CC) -DGMP -DMA lrsnash.c lrsnashlib.c -I${INCLUDEDIR} -o $@ -L . -llrs -lgmp ${LDFLAGS}
# build object files for the shared library