Module Name: othersrc
Committed By: agc
Date: Tue Oct 28 05:51:43 UTC 2014
Modified Files:
othersrc/external/bsd/multigest/bin: Makefile
othersrc/external/bsd/multigest/lib: Makefile
Log Message:
FreeBSD mods. *sigh*
adapt to the fact that digest(1) may not be available
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 othersrc/external/bsd/multigest/bin/Makefile
cvs rdiff -u -r1.2 -r1.3 othersrc/external/bsd/multigest/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/multigest/bin/Makefile
diff -u othersrc/external/bsd/multigest/bin/Makefile:1.7 othersrc/external/bsd/multigest/bin/Makefile:1.8
--- othersrc/external/bsd/multigest/bin/Makefile:1.7 Wed Mar 26 22:13:44 2014
+++ othersrc/external/bsd/multigest/bin/Makefile Tue Oct 28 05:51:43 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/03/26 22:13:44 agc Exp $
+# $NetBSD: Makefile,v 1.8 2014/10/28 05:51:43 agc Exp $
.include <bsd.own.mk>
@@ -10,8 +10,14 @@ LIB_MULTIGEST_DIR!= cd ${.CURDIR}/../lib
LDADD+= -L${LIB_MULTIGEST_DIR} -lmultigest
DPADD+= ${LIB_MULTIGEST_DIR}/libmultigest.a
-#CPPFLAGS+=-g -O0
-#LDFLAGS+=-g -O0
+.ifndef PRINTOBJDIR
+PRINTOBJDIR= ${MAKE} -V .OBJDIR
+.endif
+
+.ifndef PRODUCTION
+CPPFLAGS+=-g -O0
+LDFLAGS+=-g -O0
+.endif
WARNS=6
MAN=multigest.1
@@ -64,7 +70,7 @@ t: ${PROG}
diff 13.expected 13.out
rm -f 13.out
env LD_LIBRARY_PATH=${LIB_MULTIGEST_DIR} ./${PROG} -a whirlpool < 1.in > 14.out
- digest whirlpool < 1.in > 14.dig.out
+ ./digest whirlpool < 1.in > 14.dig.out
diff 14.dig.out 14.out
rm -f 14.dig.out 14.out
echo -n "The quick brown fox jumps over the lazy dog" | env LD_LIBRARY_PATH=${LIB_MULTIGEST_DIR} ./${PROG} -a keccak-512 > 15.out
Index: othersrc/external/bsd/multigest/lib/Makefile
diff -u othersrc/external/bsd/multigest/lib/Makefile:1.2 othersrc/external/bsd/multigest/lib/Makefile:1.3
--- othersrc/external/bsd/multigest/lib/Makefile:1.2 Sun Aug 18 18:40:27 2013
+++ othersrc/external/bsd/multigest/lib/Makefile Tue Oct 28 05:51:43 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/08/18 18:40:27 agc Exp $
+# $NetBSD: Makefile,v 1.3 2014/10/28 05:51:43 agc Exp $
LIB=multigest
@@ -23,4 +23,11 @@ DIST=${.CURDIR}/../dist
INCS=multigest.h
INCSDIR=/usr/include
+OSNAME!= uname -s
+
+.if ${OSNAME} == "FreeBSD"
+SHLIBDIR= /usr/lib
+SHLIB_MAJOR= 0
+.endif
+
.include <bsd.lib.mk>
