On Wed, November 18, 2020 22:02, Stuart Henderson wrote: > On 2020/11/18 21:14, Edd Barrett wrote: > >> On Wed, Nov 18, 2020 at 10:42:17AM -0000, Dimitri Karamazov wrote: >> >>> diff attached below with all the rest of the changes. >> >> Thanks! >> >> >> I was about to commit this when I noticed that there's a sole compiler >> invocation which is not honouring our flags: >> >> ``` >> cc -DGMP -DMA lrsnash.c lrsnashlib.c -I/usr/local/include -o lrsnash-shared >> -L . -L/usr/local/lib -llrs -lgmp ``` >> >> >> If you can fix that, I'll commit the diff :) Fixed
>
> btw there are some other parts of the Makefile patch that can be simplified
> but they could be handled later.
> Specifically, unlike
> CFLAGS/CXXFLAGS, ports doesn't have any claim to honour CPPFLAGS or
> LDFLAGS as user settings so there's no need to change the existing
> -L${LIBDIR} -> ${LDFLAGS} or -I${INCLUDEDIR} -> ${CPPFLAGS},
> as long as it's using the correct dir.
>
> Many ports do use CPPFLAGS/LDFLAGS to pass things in but this is
> normally where the upstream build system already honours them. Where upstream
> uses another mechanism (like
> LIBDIR/INCLUDEDIR here)
> it's less hassle to work with that instead.
>
Upstream is less likely to accept since it is just another mechanism,
I guess it is not possible/unlikely to change location of LOCALBASE so
it will be redundant anyway.
diff with LDFLAGS and CPPFLAGS defined exists as an attachment, just in
case.
This one simply introduces CFLAGS based on Stuart's comments.
Hope there is no confusion :)
Index: Makefile
===================================================================
RCS file: /cvs/ports/math/lrs/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 12 Jul 2019 20:47:42 -0000 1.6
+++ Makefile 19 Nov 2020 02:22:25 -0000
@@ -2,35 +2,36 @@
COMMENT = solve vertex enumeration and convex hull problems
-DISTNAME = lrslib-042c
-PKGNAME = lrs-042
-REVISION = 1
+V = 071a
+DISTNAME = lrslib-${V}
+PKGNAME = lrs-${V}
FIX_EXTRACT_PERMISSIONS=Yes
+SHARED_LIBS = lrs 0.0 # 1.0
+
CATEGORIES = math
HOMEPAGE = http://cgm.cs.mcgill.ca/~avis/C/lrs.html
-MAINTAINER = Edd Barrett <e...@openbsd.org>
+MAINTAINER = Dimitri Karamazov <deserter...@danwin1210.me>
# GPLv2
PERMIT_PACKAGE = Yes
WANTLIB = c gmp
-MASTER_SITES = http://cgm.cs.mcgill.ca/~avis/C/lrslib/
+MASTER_SITES = http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/
+
+USE_GMAKE = Yes
MAKE_FILE = makefile
-MAKE_FLAGS = CPPFLAGS=-I${LOCALBASE}/include
LDFLAGS=-L${LOCALBASE}/lib
-ALL_TARGET = gmp # build with arbitrary precision numbers
+MAKE_FLAGS = CFLAGS="${CFLAGS} -Wall" \
+ SONAME="liblrs.so.${LIBlrs_VERSION:R}" \
+ SOMINOR=".${LIBlrs_VERSION:E}"
-LIB_DEPENDS = devel/gmp
+ALL_TARGET = lrs lrsnash single all-shared
-BINARIES = 2gnash buffer gfourier glrs gnash gredund
-do-install:
-.for i in ${BINARIES}
- ${INSTALL_PROGRAM} ${WRKBUILD}/${i} ${PREFIX}/bin/
-.endfor
+LIB_DEPENDS = devel/gmp
# A simple test to check it works
REGRESS_FILES = test.ine expected_outcome.ine openbsd_regress.sh
@@ -39,10 +40,5 @@ do-test:
cp ${FILESDIR}/${i} ${WRKBUILD}
.endfor
cd ${WRKBUILD} && sh openbsd_regress.sh
-
-# resolve conflict with www/gnash and misc/buffer
-post-install:
- mv ${PREFIX}/bin/gnash ${PREFIX}/bin/lrsgnash
- mv ${PREFIX}/bin/buffer ${PREFIX}/bin/lrsbuffer
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/math/lrs/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 18 Jan 2015 03:14:27 -0000 1.2
+++ distinfo 19 Nov 2020 02:22:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (lrslib-042c.tar.gz) = U/mbUnE5e7XzF8lvo2Xtwaxx+ny6ApXIvXngiC9cOko=
-SIZE (lrslib-042c.tar.gz) = 168765
+SHA256 (lrslib-071a.tar.gz) = kmY26mjeRmJfFB9uAl3OlnzH5oz0v0pZc3XAY/XBFnM=
+SIZE (lrslib-071a.tar.gz) = 458590
Index: files/openbsd_regress.sh
===================================================================
RCS file: /cvs/ports/math/lrs/files/openbsd_regress.sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 openbsd_regress.sh
--- files/openbsd_regress.sh 7 Oct 2011 08:58:42 -0000 1.1.1.1
+++ files/openbsd_regress.sh 19 Nov 2020 02:22:25 -0000
@@ -5,7 +5,7 @@ IN=test.ine
OUT=actual_outcome.ine
EXPECT=expected_outcome.ine
-./glrs ${IN} | grep -e '^ 1' 2>&1 | tee ${OUT}
+./lrsgmp ${IN} | grep -e '^ 1' 2>&1 | tee ${OUT}
DIFF=`diff -u ${OUT} ${EXPECT}`
if [ -n "${DIFF}" ]; then
Index: patches/patch-makefile
===================================================================
RCS file: /cvs/ports/math/lrs/patches/patch-makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-makefile
--- patches/patch-makefile 7 Oct 2011 08:58:42 -0000 1.1.1.1
+++ patches/patch-makefile 19 Nov 2020 02:22:25 -0000
@@ -1,153 +1,138 @@
-$OpenBSD: patch-makefile,v 1.1.1.1 2011/10/07 08:58:42 edd Exp $
+$OpenBSD$
-Honour CFLAGS, LDFLAGS, CPPFLAGS. Use dynamic linking.
+Honour CFLAGS
+Avoid installing library symlinks
+Rectify install targets
---- makefile.orig Mon Apr 26 03:12:56 2010
-+++ makefile Mon Oct 3 12:14:16 2011
-@@ -15,87 +15,76 @@
- # make clean to clean all executables
-
-
--#Select one of the following INCLUDE,LIB paths only needed for gmp version
--
--#linux at mcgill with gmp version 3
--INCLUDEDIR = /usr/local/include
--LIBDIR = /usr/local/lib
--
--#linux at mcgill with gmp version 2
--#INCLUDEDIR = /labs/cgm/gmp2/include
--#LIBDIR = /labs/cgm/gmp2/lib
--
--
- all: lrs.c lrslib.c lrslib.h lrsmp.c lrsmp.h lrslong.c lrslong.h redund.c
buffer.c nash.c 2nash.c
-- gcc -O3 -DTIMES -DSIGNALS -o lrs lrs.c lrslib.c lrsmp.c
-- gcc -O3 -DTIMES -DSIGNALS -o redund redund.c lrslib.c lrsmp.c
-- gcc -O3 -DTIMES -DSIGNALS -DLONG -o lrs1 lrs.c lrslib.c lrslong.c
-- gcc -O3 -DTIMES -DSIGNALS -DLONG -o redund1 redund.c lrslib.c lrslong.c
-- gcc -O3 -DLRS_QUIET -DTIMES -DSIGNALS -o nash nash.c lrslib.c lrsmp.c
-- gcc -O3 -o setupnash setupnash.c lrslib.c lrsmp.c
-- gcc -O3 -o setupnash2 setupnash2.c lrslib.c lrsmp.c
-- gcc -Wall -O3 -o fourier fourier.c lrslib.c lrsmp.c
-- gcc -O3 -o buffer buffer.c
-- gcc -O3 -o 2nash 2nash.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -DTIMES -DSIGNALS -o lrs lrs.c
lrslib.c lrsmp.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -DTIMES -DSIGNALS -o redund
redund.c lrslib.c lrsmp.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -DTIMES -DSIGNALS -DLONG -o lrs1
lrs.c lrslib.c lrslong.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -DTIMES -DSIGNALS -DLONG -o
redund1 redund.c lrslib.c lrslong.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -DLRS_QUIET -DTIMES -DSIGNALS
-o nash nash.c lrslib.c lrsmp.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -o setupnash setupnash.c
lrslib.c lrsmp.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -o setupnash2 setupnash2.c
lrslib.c lrsmp.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} -Wall ${CFLAGS} -o fourier fourier.c
lrslib.c lrsmp.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -o buffer buffer.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -o 2nash 2nash.c
-
- gmp: fourier.c 2gnash.c lrs.c redund.c lrslib.h lrslib.c lrsgmp.h lrsgmp.c
nash.c
-- gcc -O3 -static -DTIMES -DSIGNALS -DGMP -I${INCLUDEDIR} lrs.c lrslib.c
lrsgmp.c -L${LIBDIR} -lgmp -o glrs
-- gcc -O3 -static -DTIMES -DSIGNALS -DGMP -I${INCLUDEDIR} redund.c
lrslib.c lrsgmp.c -L${LIBDIR} -lgmp -o gredund
-- gcc -O3 -static -DLRS_QUIET -DTIMES -DSIGNALS -DGMP -I${INCLUDEDIR}
nash.c lrslib.c lrsgmp.c -L${LIBDIR} -lgmp -o
gnash
-- gcc -O3 -static -DTIMES -DSIGNALS -DGMP -I${INCLUDEDIR} fourier.c
lrslib.c lrsgmp.c -L${LIBDIR} -lgmp -o gfourier
-- gcc -O3 -o buffer buffer.c
-- gcc -O3 -o 2gnash 2gnash.c
-- gcc -O3 -static -DTIMES -DSIGNALS -DGMP -I${INCLUDEDIR} fourier.c
lrslib.c lrsgmp.c -L${LIBDIR} -lgmp -o gfourier
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -DTIMES -DSIGNALS -DGMP lrs.c
lrslib.c lrsgmp.c ${LDFLAGS} -lgmp -o glrs
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -DTIMES -DSIGNALS -DGMP
redund.c lrslib.c lrsgmp.c ${LDFLAGS} -lgmp -o gredund
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -DLRS_QUIET -DTIMES -DSIGNALS
-DGMP nash.c lrslib.c lrsgmp.c ${LDFLAGS}
-lgmp -o gnash
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -DTIMES -DSIGNALS -DGMP
fourier.c lrslib.c lrsgmp.c ${LDFLAGS} -lgmp -o
gfourier
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -o buffer buffer.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -o 2gnash 2gnash.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -DTIMES -DSIGNALS -DGMP
fourier.c lrslib.c lrsgmp.c -lgmp -o gfourier
- gnash: lrslib.h lrslib.c lrsgmp.h lrsgmp.c nash.c 2gnash.c
-- gcc -O3 -static -DLRS_QUIET -DTIMES -DSIGNALS -DGMP -I${INCLUDEDIR}
nash.c lrslib.c lrsgmp.c -L${LIBDIR} -lgmp -o
gnash
-- gcc -O3 -o 2gnash 2gnash.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -DLRS_QUIET -DTIMES -DSIGNALS
-DGMP nash.c lrslib.c lrsgmp.c ${LDFLAGS}
-lgmp -o gnash
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -o 2gnash 2gnash.c
-
- all64: lrs.c lrslib.c lrslib.h lrsmp.c lrsmp.h lrslong.c lrslong.h
redund.c buffer.c
-- gcc -DTIMES -DSIGNALS -DB64 -O3 -o lrs lrs.c lrslib.c lrsmp.c
-- gcc -DTIMES -DSIGNALS -DB64 -O3 -o redund redund.c lrslib.c lrsmp.c
-- gcc -DTIMES -DSIGNALS -DLONG -DB64 -O3 -o lrs1 lrs.c lrslib.c lrslong.c
-- gcc -DTIMES -DSIGNALS -DLONG -DB64 -O3 -o redund1 redund.c lrslib.c
lrslong.c
-- gcc -O3 -o buffer buffer.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} -DTIMES -DSIGNALS -DB64 ${CFLAGS} -o lrs
lrs.c lrslib.c lrsmp.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} -DTIMES -DSIGNALS -DB64 ${CFLAGS} -o
redund redund.c lrslib.c lrsmp.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} -DTIMES -DSIGNALS -DLONG -DB64 ${CFLAGS}
-o lrs1 lrs.c lrslib.c lrslong.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} -DTIMES -DSIGNALS -DLONG -DB64 ${CFLAGS}
-o redund1 redund.c lrslib.c lrslong.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -o buffer buffer.c
-
- ansi: lrs.c lrslib.c lrslib.h lrsmp.c lrsmp.h lrslong.c lrslong.h redund.c
buffer.c nash.c
-- gcc -ansi -DTIMES -O3 -o lrs lrs.c lrslib.c lrsmp.c
-- gcc -ansi -DTIMES -O3 -o redund redund.c lrslib.c lrsmp.c
-- gcc -ansi -DTIMES -DLONG -O3 -o lrs1 lrs.c lrslib.c lrslong.c
-- gcc -ansi -DTIMES -DLONG -O3 -o redund1 redund.c lrslib.c lrslong.c
-- gcc -O3 -o buffer buffer.c
-- gcc -Wall -ansi -O3 -o nash nash.c lrslib.c lrsmp.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} -ansi -DTIMES ${CFLAGS} -o lrs lrs.c
lrslib.c lrsmp.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} -ansi -DTIMES ${CFLAGS} -o redund
redund.c lrslib.c lrsmp.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} -ansi -DTIMES -DLONG ${CFLAGS} -o lrs1
lrs.c lrslib.c lrslong.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} -ansi -DTIMES -DLONG ${CFLAGS} -o
redund1 redund.c lrslib.c lrslong.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -o buffer buffer.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} -Wall -ansi ${CFLAGS} -o nash nash.c
lrslib.c lrsmp.c
-
- nosigs: lrs.c lrslib.c lrslib.h lrsmp.c lrsmp.h lrslong.c lrslong.h
redund.c buffer.c
-- gcc -ansi -O3 -o lrs lrs.c lrslib.c lrsmp.c
-- gcc -ansi -O3 -o redund redund.c lrslib.c lrsmp.c
-- gcc -ansi -O3 -DLONG -o lrs1 lrs.c lrslib.c lrslong.c
-- gcc -ansi -O3 -DLONG -o redund1 redund.c lrslib.c lrslong.c
-- gcc -ansi -O3 -o buffer buffer.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} -ansi ${CFLAGS} -o lrs lrs.c lrslib.c
lrsmp.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} -ansi ${CFLAGS} -o redund redund.c
lrslib.c lrsmp.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} -ansi ${CFLAGS} -DLONG -o lrs1 lrs.c
lrslib.c lrslong.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} -ansi ${CFLAGS} -DLONG -o redund1
redund.c lrslib.c lrslong.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} -ansi ${CFLAGS} -o buffer buffer.c
-
- lrs: lrs.c lrslib.c lrslong.c lrsmp.c
-- gcc -Wall -ansi -O3 -o lrs lrs.c lrslib.c lrsmp.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} -Wall -ansi ${CFLAGS} -o lrs lrs.c
lrslib.c lrsmp.c
-
- redund: redund.c lrslib.c lrslong.c lrsmp.c
-- gcc -Wall -ansi -O3 -o redund redund.c lrslib.c lrsmp.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} -Wall -ansi ${CFLAGS} -o redund redund.c
lrslib.c lrsmp.c
-
- nash: setupnash2.c setupnash.c nash.c lrslib.c lrsmp.c 2nash.c
-- gcc -Wall -DTIMES -ansi -O3 -o nash nash.c lrslib.c lrsmp.c
-- gcc -Wall -o setupnash setupnash.c lrslib.c lrsmp.c
-- gcc -Wall -o setupnash2 setupnash2.c lrslib.c lrsmp.c
-- gcc -O3 -o 2nash 2nash.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} -Wall -DTIMES -ansi ${CFLAGS} -o nash
nash.c lrslib.c lrsmp.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} -Wall -o setupnash setupnash.c lrslib.c
lrsmp.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} -Wall -o setupnash2 setupnash2.c lrslib.c
lrsmp.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -o 2nash 2nash.c
-
- fourier: fourier.c lrslib.c lrslong.c lrsmp.c
-- gcc -Wall -O3 -o fourier fourier.c lrslib.c lrsmp.c
-- gcc -O3 -static -DTIMES -DSIGNALS -DGMP -I${INCLUDEDIR} fourier.c
lrslib.c lrsgmp.c -L${LIBDIR} -lgmp -o gfourier
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} -Wall ${CFLAGS} -o fourier fourier.c
lrslib.c lrsmp.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -DTIMES -DSIGNALS -DGMP
fourier.c lrslib.c lrsgmp.c -lgmp -o gfourier
-
- demo: lpdemo.c chdemo.c vedemo.c lrslib.c lrslong.c lrsmp.c
-- gcc -Wall -ansi -O3 -o lpdemo lpdemo.c lrslib.c lrsmp.c
-- gcc -Wall -ansi -O3 -o vedemo vedemo.c lrslib.c lrsmp.c
-- gcc -Wall -ansi -O3 -o chdemo chdemo.c lrslib.c lrsmp.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} -Wall -ansi ${CFLAGS} -o lpdemo lpdemo.c
lrslib.c lrsmp.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} -Wall -ansi ${CFLAGS} -o vedemo vedemo.c
lrslib.c lrsmp.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} -Wall -ansi ${CFLAGS} -o chdemo chdemo.c
lrslib.c lrsmp.c
-
- float: float2rat.c rat2float.c lrsmp.c
-- gcc -DLRSMP -Wall -ansi -o float2rat float2rat.c lrsmp.c
-- gcc -DLRSMP -Wall -ansi -o rat2float rat2float.c lrsmp.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} -DLRSMP -Wall -ansi -o float2rat
float2rat.c lrsmp.c
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} -DLRSMP -Wall -ansi -o rat2float
rat2float.c lrsmp.c
-
- clean:
- rm -rf lrs lrs1 redund redund1 buffer glrs gredund
-@@ -105,8 +94,8 @@ clean:
- rm -rf nash gnash setupnash setupnash2
-
- foo: foo.c lrslib.h lrslib.c lrsmp.h lrsmp.c
-- gcc -O3 -static -DTIMES -DSIGNALS foo.c lrslib.c lrsmp.c -L${LIBDIR}
-o foo
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -DTIMES -DSIGNALS foo.c
lrslib.c lrsmp.c ${LDFLAGS} -o foo
-
- gfoo: foo.c lrslib.h lrslib.c lrsgmp.h lrsgmp.c
-- gcc -O3 -static -DTIMES -DSIGNALS -DGMP -I${INCLUDEDIR} foo.c lrslib.c
lrsgmp.c -L${LIBDIR} -lgmp -o gfoo
-+ ${CC} ${CPPFLAGS} ${LDFLAGS} ${CFLAGS} -DTIMES -DSIGNALS -DGMP foo.c
lrslib.c lrsgmp.c -lgmp -o gfoo
+--- makefile.orig Sat Oct 17 11:48:42 2020
++++ makefile Thu Nov 19 07:42:37 2020
+@@ -52,8 +52,8 @@ MPLRSOBJ64=lrslong1-mplrs.o lrslib1-mplrs.o lrslibgmp-
+
+ lrs: ${LRSOBJ}
+ $(CC) ${CFLAGS} -DMA -DB128 -L${LIBDIR} -o lrs ${LRSOBJ} -lgmp
+- $(CC) -O3 -DGMP -I${INCLUDEDIR} -o lrsgmp lrs.c lrslib.c lrsgmp.c
lrsdriver.c -L${LIBDIR} -lgmp
+- $(CC) -O3 hvref.c -o hvref
++ $(CC) ${CFLAGS} -DGMP -I${INCLUDEDIR} -o lrsgmp lrs.c lrslib.c lrsgmp.c
lrsdriver.c -L${LIBDIR} -lgmp
++ $(CC) ${CFLAGS} hvref.c -o hvref
+ ln -s -f lrs redund
+ ln -s -f lrsgmp redundgmp
+
+@@ -134,48 +134,48 @@ singlemplrs: mplrsgmp mplrs1 mplrs2
+
+ flint: lrs.c lrslib.c lrslib.h lrsgmp.c lrsgmp.h
+ @test -d ${INCLUDEDIR}/flint || { echo ${INCLUDEDIR}/flint not
found; exit 1; }
+- $(CC) -O3 -DFLINT -I${INCLUDEDIR} -I${INCLUDEDIR}/flint lrs.c
lrsdriver.c lrslib.c lrsgmp.c -L${LIBDIR} -lflint -o
lrsflint -lgmp
++ $(CC) ${CFLAGS} -DFLINT -I${INCLUDEDIR} -I{INCLUDEDIR}/flint
lrs.c lrsdriver.c lrslib.c lrsgmp.c -L${LIBDIR}
-lflint -o lrsflint -lgmp
+
+ mplrsflint: mplrs.c mplrs.h lrslib.c lrslib.h lrsgmp.c lrsgmp.h lrsdriver.c
lrsdriver.h
+- ${mpicxx} ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DFLINT
-I${INCLUDEDIR}/flint -DPLRS -o mplrsflint mplrs.c
lrsdriver.c lrslib.c lrsgmp.c -L${LIBDIR} -lflint -lgmp
++ ${mpicxx} ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DFLINT
-I${INCLUDEDIR}/flint -DPLRS -o mplrsflint mplrs.c
lrsdriver.c lrslib.c lrsgmp.c -L${LIBDIR} -lflint -lgmp
+
+ #comment out lines with -DB128 if __int128 not supported by your C compiler
+
+ lrsgmp: lrs.c lrslib.c lrslib.h lrsgmp.c lrsgmp.h lrsdriver.h
lrsdriver.c
+- $(CC) -O3 -DGMP -I${INCLUDEDIR} -o lrsgmp lrs.c lrslib.c
lrsgmp.c lrsdriver.c -L${LIBDIR} -lgmp
++ $(CC) ${CFLAGS} -DGMP -I${INCLUDEDIR} -o lrsgmp lrs.c lrslib.c
lrsgmp.c lrsdriver.c -L${LIBDIR} -lgmp
+
+ single: lrs.c lrslong.c lrslong.h lrslib.c lrslib.h lrsgmp.c
lrsgmp.h lrsdriver.h lrsdriver.c
+- $(CC) -O3 -DSAFE -DLRSLONG -o lrs1 lrs.c lrslib.c lrslong.c
lrsdriver.c
+- $(CC) -O3 -DB128 -DSAFE -DLRSLONG -o lrs2 lrs.c lrslib.c
lrslong.c lrsdriver.c
++ $(CC) ${CFLAGS} -DSAFE -DLRSLONG -o lrs1 lrs.c lrslib.c
lrslong.c lrsdriver.c
++ $(CC) ${CFLAGS} -DB128 -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 -DB128 -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
+- $(CC) -O3 -o setnash setupnash.c lrslib.c lrsdriver.c lrsmp.c
+- $(CC) -O3 -o setnash2 setupnash2.c lrslib.c lrsdriver.c lrsmp.c
+- $(CC) -O3 -o 2nash 2nash.c
++ $(CC) ${CFLAGS} -o lrs lrs.c lrslib.c lrsdriver.c lrsmp.c
++ $(CC) ${CFLAGS} -DSAFE -DLRSLONG -o lrs1 lrs.c lrslib.c
lrsdriver.c lrslong.c
++ $(CC) ${CFLAGS} -DSAFE -DLRSLONG -DB128 -o lrs2 lrs.c lrslib.c
lrsdriver.c lrslong.c
++ $(CC) ${CFLAGS} -DLRS_QUIET -o lrsnash lrsnash.c lrsnashlib.c
lrslib.c lrsdriver.c lrsmp.c
++ $(CC) ${CFLAGS} -o setnash setupnash.c lrslib.c lrsdriver.c
lrsmp.c
++ $(CC) ${CFLAGS} -o setnash2 setupnash2.c lrslib.c lrsdriver.c
lrsmp.c
++ $(CC) ${CFLAGS} -o 2nash 2nash.c
+
+ demo: lpdemo1.c lrslib.c lrsdriver.c lrslib.h lrsgmp.c lrsgmp.h
+- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o lpdemo1 lpdemo1.c lrslib.c
lrsdriver.c lrsgmp.c -lgmp -DGMP
+- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o lpdemo lpdemo.c lrslib.c
lrsdriver.c lrsgmp.c -lgmp -DGMP
+- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o lpdemo2 lpdemo2.c lrslib.c
lrsdriver.c lrsgmp.c -lgmp -DGMP
+- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o vedemo vedemo.c lrslib.c
lrsdriver.c lrsgmp.c -lgmp -DGMP
+- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o chdemo chdemo.c lrslib.c
lrsdriver.c lrsgmp.c -lgmp -DGMP
++ $(CC) ${CFLAGS} -I${INCLUDEDIR} -L${LIBDIR} -o lpdemo1 lpdemo1.c
lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP
++ $(CC) ${CFLAGS} -I${INCLUDEDIR} -L${LIBDIR} -o lpdemo lpdemo.c lrslib.c
lrsdriver.c lrsgmp.c -lgmp -DGMP
++ $(CC) ${CFLAGS} -I${INCLUDEDIR} -L${LIBDIR} -o lpdemo2 lpdemo2.c
lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP
++ $(CC) ${CFLAGS} -I${INCLUDEDIR} -L${LIBDIR} -o vedemo vedemo.c
lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP
++ $(CC) ${CFLAGS} -I${INCLUDEDIR} -L${LIBDIR} -o chdemo chdemo.c
lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP
+
+ 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 -DB128
+- $(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
++ $(CC) ${CFLAGS} -I${INCLUDEDIR} -L${LIBDIR} -o lrsnashgmp
lrsnash.c lrsnashlib.c lrslib.c lrsgmp.c lrsdriver.c
-lgmp -DGMP
++ $(CC) ${CFLAGS} -I${INCLUDEDIR} -L${LIBDIR} -o lrsnash1
lrsnash.c lrsnashlib.c lrslib.c lrslong.c lrsdriver.c
-DLRSLONG -DSAFE
++ $(CC) ${CFLAGS} -I${INCLUDEDIR} -L${LIBDIR} -o lrsnash2
lrsnash.c lrsnashlib.c lrslib.c lrslong.c lrsdriver.c
-DLRSLONG -DSAFE -DB128
++ $(CC) ${CFLAGS} -I${INCLUDEDIR} -L${LIBDIR} -o nashdemo
nashdemo.c lrsnashlib.c lrslib.c lrsgmp.c lrsdriver.c
-lgmp -DGMP
++ $(CC) ${CFLAGS} -I${INCLUDEDIR} -L${LIBDIR} -o 2nash 2nash.c
+ cp lrsnashgmp lrsnash
+
+ fourier: fourier.c lrslib.h lrslib.c lrsgmp.h lrsgmp.c
+- $(CC) -O3 -DGMP -I${INCLUDEDIR} fourier.c lrslib.c lrsdriver.c
lrsgmp.c -L${LIBDIR} -lgmp -o fourier
++ $(CC) ${CFLAGS} -DGMP -I${INCLUDEDIR} fourier.c lrslib.c lrsdriver.c
lrsgmp.c -L${LIBDIR} -lgmp -o fourier
+
+ ######################################################################
+ # From here on the author is David Bremner <brem...@unb.ca> to whom you
should turn for help
+@@ -189,12 +189,12 @@ SHLINK ?=liblrs.so
+ SHLIBOBJ=lrslong1-shr.o lrslong2-shr.o lrslib1-shr.o lrslib2-shr.o \
+ lrslibgmp-shr.o lrsgmp-shr.o lrsdriver-shr.o
+
+-SHLIBBIN=lrs-shared lrsnash-shared
++SHLIBBIN=lrs-shared lrsnash-shared lrs1 lrs2 lrsgmp lrsnash1 lrsnash2
lrsnashgmp 2nash nashdemo redund redund1
redund2 redundgmp
+
+ # Building (linking) the shared library, and relevant symlinks.
+
+ ${SHLIB}: ${SHLIBOBJ}
+- $(CC) -shared -Wl,-soname=$(SONAME) $(SHLIBFLAGS) -o $@ ${SHLIBOBJ}
-lgmp
++ $(CC) -shared -Wl,-soname=${SHLIB} $(SHLIBFLAGS) -o $@ ${SHLIBOBJ}
-L${LIBDIR} -lgmp
+
+ ${SONAME}: ${SHLIB}
+ ln -sf ${SHLIB} ${SONAME}
+@@ -211,7 +211,7 @@ lrs-shared: ${SHLINK} lrs.o
+
+
+ lrsnash-shared: ${SHLINK} lrsnash.c
+- $(CC) -DGMP -DMA lrsnash.c lrsnashlib.c -I${INCLUDEDIR} -o $@ -L .
-llrs -lgmp
++ $(CC) ${CFLAGS} -DGMP -DMA lrsnash.c lrsnashlib.c -I${INCLUDEDIR} -o
$@ -L . -L${LIBDIR} -llrs -lgmp
+
+ # build object files for the shared library
+
+@@ -240,19 +240,17 @@ lrslib2-shr.o: lrslib.c lrslib.h
+ # 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 lrsnashlib.h
lrsrestart.h
+
+ install: all-shared install-common
+ mkdir -p $(DESTDIR)${prefix}/bin
+ for file in ${SHLIBBIN}; do cp $${file}
$(DESTDIR)${prefix}/bin/$$(basename $$file -shared); done
+ mkdir -p $(DESTDIR)${prefix}/lib
+- install -t $(DESTDIR)${prefix}/lib $(SHLIB)
+- cd $(DESTDIR)${prefix}/lib && ln -sf $(SHLIB) $(SHLINK)
+- cd $(DESTDIR)${prefix}/lib && ln -sf $(SHLIB) $(SONAME)
++ install $(SHLIB) $(DESTDIR)${prefix}/lib
+
+ install-common:
+ mkdir -p $(DESTDIR)${prefix}/include/lrslib
+- install -t $(DESTDIR)${prefix}/include/lrslib ${INSTALL_INCLUDES}
++ install ${INSTALL_INCLUDES} $(DESTDIR)${prefix}/include/lrslib
+ ######################################################################
+ clean:
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/math/lrs/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 7 Nov 2011 12:16:22 -0000 1.2
+++ pkg/PLIST 19 Nov 2020 02:22:25 -0000
@@ -1,7 +1,24 @@
@comment $OpenBSD: PLIST,v 1.2 2011/11/07 12:16:22 edd Exp $
-@bin bin/2gnash
-@bin bin/gfourier
-@bin bin/glrs
-@bin bin/gredund
-@bin bin/lrsbuffer
-@bin bin/lrsgnash
+@bin bin/2nash
+@bin bin/lrs
+@bin bin/lrs1
+@bin bin/lrs2
+@bin bin/lrsgmp
+@bin bin/lrsnash
+@bin bin/lrsnash1
+@bin bin/lrsnash2
+@bin bin/lrsnashgmp
+@bin bin/nashdemo
+@bin bin/redund
+@bin bin/redund1
+@bin bin/redund2
+@bin bin/redundgmp
+include/lrslib/
+include/lrslib/lrsdriver.h
+include/lrslib/lrsgmp.h
+include/lrslib/lrslib.h
+include/lrslib/lrslong.h
+include/lrslib/lrsmp.h
+include/lrslib/lrsnashlib.h
+include/lrslib/lrsrestart.h
+@lib lib/liblrs.so.${LIBlrs_VERSION}
diff
Description: Binary data
