[arch-commits] Commit in lrs/repos/community-x86_64 (5 files)
Antonio Rojas
arojas at archlinux.org
Fri Jun 4 15:00:11 UTC 2021
Date: Friday, June 4, 2021 @ 15:00:11
Author: arojas
Revision: 955918
archrelease: copy trunk to community-x86_64
Added:
lrs/repos/community-x86_64/PKGBUILD
(from rev 955917, lrs/trunk/PKGBUILD)
lrs/repos/community-x86_64/lrs-system-cflags.patch
(from rev 955917, lrs/trunk/lrs-system-cflags.patch)
Deleted:
lrs/repos/community-x86_64/PKGBUILD
lrs/repos/community-x86_64/lrs-missing-include.patch
lrs/repos/community-x86_64/lrs-system-cflags.patch
---------------------------+
PKGBUILD | 63 +++++++++++++++++--------------------
lrs-missing-include.patch | 34 --------------------
lrs-system-cflags.patch | 74 +++++++++++++++++++++-----------------------
3 files changed, 66 insertions(+), 105 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-06-04 15:00:00 UTC (rev 955917)
+++ PKGBUILD 2021-06-04 15:00:11 UTC (rev 955918)
@@ -1,33 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=lrs
-pkgver=071.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
- lrs-missing-include.patch)
-sha256sums=('926636ea68de46625f141f6e025dce967cc7e68cf4bf4a597375c063f5c11673'
- '8e43f9f6c583c653e28b75907f27f616f45f36d6fc677a4aae6a7004d60424c0'
- '61da0543e92ab242df1d5adcb6bb842a3c489c011c858705278de1c6cf580649')
-
-prepare() {
- cd lrslib-$_pkgver
- patch -p1 -i ../lrs-system-cflags.patch # Use system CFLAGS/LDFLAGS
- patch -p1 -i ../lrs-missing-include.patch # Install missing header
-}
-
-build() {
- cd lrslib-$_pkgver
- make
-}
-
-package() {
- cd lrslib-$_pkgver
- make DESTDIR="$pkgdir" prefix=/usr install
-}
Copied: lrs/repos/community-x86_64/PKGBUILD (from rev 955917, lrs/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-06-04 15:00:11 UTC (rev 955918)
@@ -0,0 +1,30 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgname=lrs
+pkgver=071.b
+_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)
+sha256sums=('df22682cd742315fe04f866cfe4804d5950f7dc7f514d5b5f36f5b7f5aff9188'
+ '617ed06ae2584ef3349a3b1f6ab1a4acd11f18211394458498e1223a65bb0e73')
+
+prepare() {
+ cd lrslib-$_pkgver
+ patch -p1 -i ../lrs-system-cflags.patch # Use system CFLAGS/LDFLAGS
+}
+
+build() {
+ cd lrslib-$_pkgver
+ make
+}
+
+package() {
+ cd lrslib-$_pkgver
+ make DESTDIR="$pkgdir" prefix=/usr install
+}
Deleted: lrs-missing-include.patch
===================================================================
--- lrs-missing-include.patch 2021-06-04 15:00:00 UTC (rev 955917)
+++ lrs-missing-include.patch 2021-06-04 15:00:11 UTC (rev 955918)
@@ -1,34 +0,0 @@
---- lrslib-071/makefile.orig 2020-06-04 09:58:02.217703517 +0000
-+++ lrslib-071/makefile 2020-06-04 09:59:20.505523290 +0000
-@@ -239,7 +239,7 @@
- # install targets
- # where to install binaries, libraries, include files
- prefix ?= /usr/local
--INSTALL_INCLUDES=lrslib.h lrsdriver.h lrsgmp.h lrslong.h lrsmp.h
-+INSTALL_INCLUDES=lrslib.h lrsdriver.h lrsgmp.h lrslong.h lrsmp.h lrsrestart.h
-
- install: all-shared install-common
- mkdir -p $(DESTDIR)${prefix}/bin
-diff --git a/lrslib-071/lrslib.h.orig b/lrslib-071/lrslib.h
-index a2eb4b5..ee48475 100644
---- lrslib-071/lrslib.h.orig
-+++ lrslib-071/lrslib.h
-@@ -148,6 +148,8 @@
-
- #include ARITH
-
-+#include "lrsdriver.h"
-+
- #ifndef SIGNALS
- #include <signal.h>
- #include <unistd.h>
---- lrslib-071/lrslib.c.orig 2020-06-04 10:43:56.790948185 +0000
-+++ lrslib-071/lrslib.c 2020-06-04 10:44:05.641075898 +0000
-@@ -27,7 +27,6 @@
- #include <string.h>
- #include <setjmp.h>
- #include <limits.h>
--#include "lrsrestart.h"
- #include "lrslib.h"
-
- static unsigned long dict_count, dict_limit, cache_tries, cache_misses;
Deleted: lrs-system-cflags.patch
===================================================================
--- lrs-system-cflags.patch 2021-06-04 15:00:00 UTC (rev 955917)
+++ lrs-system-cflags.patch 2021-06-04 15:00:11 UTC (rev 955918)
@@ -1,38 +0,0 @@
---- lrslib-071/makefile.orig 2020-06-04 09:58:02.217703517 +0000
-+++ lrslib-071/makefile 2020-06-04 09:59:20.505523290 +0000
-@@ -32,10 +32,9 @@
- #LIBDIR = /usr/lib
-
- #Kyoto machines usage
--INCLUDEDIR = /usr/local/include
--LIBDIR = /usr/local/lib
-+INCLUDEDIR = /usr/include
-+LIBDIR = /usr/lib
-
--CFLAGS = -O3 -Wall
- #CFLAGS = -g -Wall
-
- #use this if you want only output file contain data between begin/end lines
-@@ -194,7 +193,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}
-@@ -207,11 +206,11 @@
- all-shared: ${SHLIBBIN}
-
- lrs-shared: ${SHLINK} lrs.o
-- $(CC) lrs.o -o $@ -L . -llrs
-+ $(CC) lrs.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
-
Copied: lrs/repos/community-x86_64/lrs-system-cflags.patch (from rev 955917, lrs/trunk/lrs-system-cflags.patch)
===================================================================
--- lrs-system-cflags.patch (rev 0)
+++ lrs-system-cflags.patch 2021-06-04 15:00:11 UTC (rev 955918)
@@ -0,0 +1,36 @@
+--- lrslib-071/makefile.orig 2020-06-04 09:58:02.217703517 +0000
++++ lrslib-071/makefile 2020-06-04 09:59:20.505523290 +0000
+@@ -32,8 +32,8 @@
+ #LIBDIR = /usr/lib
+
+ #Kyoto machines usage
+-INCLUDEDIR = /usr/local/include
+-LIBDIR = /usr/local/lib
++INCLUDEDIR = /usr/include
++LIBDIR = /usr/lib
+
+ CFLAGS ?= -O3 -Wall
+ #CFLAGS = -g -Wall
+@@ -228,7 +228,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}
+@@ -241,11 +240,11 @@
+ all-shared: ${SHLIBBIN}
+
+ lrs-shared: ${SHLINK} lrs-shared.o
+- $(CC) $^ -o $@ -L . -llrs
++ $(CC) $^ -o $@ -L . -llrs ${LDFLAGS}
+
+
+ lrsnash-shared: ${SHLINK} lrsnash.c
+- $(CC) ${CFLAGS} -DGMP -DMA lrsnash.c lrsnashlib.c -I${INCLUDEDIR} -o $@ -L . -llrs -lgmp
++ $(CC) ${CFLAGS} -DGMP -DMA lrsnash.c lrsnashlib.c -I${INCLUDEDIR} -o $@ -L . -llrs -lgmp ${LDFLAGS}
+
+ # driver object files
+
More information about the arch-commits
mailing list