[arch-commits] Commit in lrs/repos/community-staging-x86_64 (5 files)

Antonio Rojas arojas at archlinux.org
Thu Jun 4 10:29:55 UTC 2020


    Date: Thursday, June 4, 2020 @ 10:29:55
  Author: arojas
Revision: 638885

archrelease: copy trunk to community-staging-x86_64

Added:
  lrs/repos/community-staging-x86_64/PKGBUILD
    (from rev 638884, lrs/trunk/PKGBUILD)
  lrs/repos/community-staging-x86_64/lrs-missing-include.patch
    (from rev 638884, lrs/trunk/lrs-missing-include.patch)
  lrs/repos/community-staging-x86_64/lrs-system-cflags.patch
    (from rev 638884, lrs/trunk/lrs-system-cflags.patch)
Deleted:
  lrs/repos/community-staging-x86_64/PKGBUILD
  lrs/repos/community-staging-x86_64/lrs-system-cflags.patch

---------------------------+
 PKGBUILD                  |   63 +++++++++++++++++++-----------------
 lrs-missing-include.patch |   12 ++++++
 lrs-system-cflags.patch   |   76 ++++++++++++++++++++++----------------------
 3 files changed, 83 insertions(+), 68 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-04 10:29:04 UTC (rev 638884)
+++ PKGBUILD	2020-06-04 10:29:55 UTC (rev 638885)
@@ -1,30 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=lrs
-pkgver=071
-_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=('d3ea5636bfde3011d43c835773fabe131d9251197b6cc666a52d8caa3e1c7816'
-            '8e43f9f6c583c653e28b75907f27f616f45f36d6fc677a4aae6a7004d60424c0')
-
-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
-}

Copied: lrs/repos/community-staging-x86_64/PKGBUILD (from rev 638884, lrs/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-06-04 10:29:55 UTC (rev 638885)
@@ -0,0 +1,33 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgname=lrs
+pkgver=071
+_pkgver=${pkgver/./}
+pkgrel=2
+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=('d3ea5636bfde3011d43c835773fabe131d9251197b6cc666a52d8caa3e1c7816'
+            '8e43f9f6c583c653e28b75907f27f616f45f36d6fc677a4aae6a7004d60424c0'
+            '6d5b97457353948c92a67d65288eb6c6492679ec80d3234abe31684d9225925c')
+
+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-staging-x86_64/lrs-missing-include.patch (from rev 638884, lrs/trunk/lrs-missing-include.patch)
===================================================================
--- lrs-missing-include.patch	                        (rev 0)
+++ lrs-missing-include.patch	2020-06-04 10:29:55 UTC (rev 638885)
@@ -0,0 +1,12 @@
+--- 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
+ 

Deleted: lrs-system-cflags.patch
===================================================================
--- lrs-system-cflags.patch	2020-06-04 10:29:04 UTC (rev 638884)
+++ lrs-system-cflags.patch	2020-06-04 10:29:55 UTC (rev 638885)
@@ -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-staging-x86_64/lrs-system-cflags.patch (from rev 638884, lrs/trunk/lrs-system-cflags.patch)
===================================================================
--- lrs-system-cflags.patch	                        (rev 0)
+++ lrs-system-cflags.patch	2020-06-04 10:29:55 UTC (rev 638885)
@@ -0,0 +1,38 @@
+--- 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
+ 



More information about the arch-commits mailing list