Date: Monday, April 29, 2019 @ 12:04:18 Author: arojas Revision: 456046
Update to 070 Added: lrs/trunk/lrs-system-cflags.patch Modified: lrs/trunk/PKGBUILD -------------------------+ PKGBUILD | 27 ++++++++++++++------------- lrs-system-cflags.patch | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 13 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-04-29 12:04:09 UTC (rev 456045) +++ PKGBUILD 2019-04-29 12:04:18 UTC (rev 456046) @@ -1,10 +1,7 @@ # Maintainer: Antonio Rojas <aro...@archlinux.org> pkgname=lrs -_pkgver=062 -_date=2017-03-03 -pkgver=$_pkgver+${_date//-/.} -_upstreamver=${_pkgver}+autotools-$_date +pkgver=070 pkgrel=1 pkgdesc="C implementation of the reverse search algorithm for vertex enumeration/convex hull problems" arch=(x86_64) @@ -11,18 +8,22 @@ 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") -source=(https://github.com/mkoeppe/lrslib/releases/download/${pkgname}lib-$_upstreamver/${pkgname}lib-${_upstreamver/+/.}.tar.gz) -sha256sums=('03b80a94ac4d673d588cac2561b02f6217d5a9f056e09ed59916a337974524f8') +source=("http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/lrslib-$pkgver.tar.gz" + lrs-system-cflags.patch) +sha256sums=('e9f12b29be89b3ad6984f3a9cf83f5776ac06edc57b0716649e63395e5ac4dfe' + '23814d543e458f43b9871f5de6112f3ca331d8ded3449c7e2efa681ca5a6606f') +prepare() { + cd lrslib-$pkgver + patch -p1 -i ../lrs-system-cflags.patch # Use system CFLAGS/LDFLAGS +} + build() { - cd ${pkgname}lib-$_upstreamver - ./configure --prefix=/usr - make + cd lrslib-$pkgver + make -j1 } package() { - cd ${pkgname}lib-$_upstreamver - make DESTDIR="$pkgdir" install + cd lrslib-$pkgver + make DESTDIR="$pkgdir" prefix=/usr install } - Added: lrs-system-cflags.patch =================================================================== --- lrs-system-cflags.patch (rev 0) +++ lrs-system-cflags.patch 2019-04-29 12:04:18 UTC (rev 456046) @@ -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 +