Module Name: othersrc
Committed By: agc
Date: Sat Mar 10 21:18:04 UTC 2012
Modified Files:
othersrc/crypto/external/bsd/ssss/ssss: Makefile
Log Message:
don't link with libthreshold any more
run simple tests in place without requiring lib installation
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/crypto/external/bsd/ssss/ssss/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/crypto/external/bsd/ssss/ssss/Makefile
diff -u othersrc/crypto/external/bsd/ssss/ssss/Makefile:1.1.1.1 othersrc/crypto/external/bsd/ssss/ssss/Makefile:1.2
--- othersrc/crypto/external/bsd/ssss/ssss/Makefile:1.1.1.1 Mon Mar 21 05:43:37 2011
+++ othersrc/crypto/external/bsd/ssss/ssss/Makefile Sat Mar 10 21:18:03 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/03/21 05:43:37 agc Exp $
+# $NetBSD: Makefile,v 1.2 2012/03/10 21:18:03 agc Exp $
.include <bsd.own.mk>
@@ -7,9 +7,6 @@ CPPFLAGS+= -I${EXTDIST}/include
LIBSSSSDIR!= cd ${.CURDIR}/../libssss && ${PRINTOBJDIR}
LDADD+= -L${LIBSSSSDIR} -lssss
DPADD+= ${LIBSSSSDIR}/libssss.a
-LIBTHRESHDIR!= cd ${.CURDIR}/../../../../../external/bsd/threshold/libthreshold && ${PRINTOBJDIR}
-LDADD+= -L${LIBTHRESHDIR} -lthreshold
-DPADD+= ${LIBTHRESHDIR}/libthreshold.a
USE_FORT?= yes
@@ -27,16 +24,16 @@ EXTDIST=${.CURDIR}/../dist
t test tst: $(PROG)
cp /etc/group secretfile
- ./${PROG} -t 3/10 secretfile
+ env LD_LIBRARY_PATH=${LIBSSSSDIR} ./${PROG} -t 3/10 secretfile
ls -al secretfile.0*
- ./${PROG} -j -o secretfile.recons secretfile.004 secretfile.002 secretfile.003
+ env LD_LIBRARY_PATH=${LIBSSSSDIR} ./${PROG} -j -o secretfile.recons secretfile.004 secretfile.002 secretfile.003
diff secretfile secretfile.recons
- ./${PROG} -t 2/10 < secretfile
- ls -al threshold.0*
- ./${PROG} -j -o secretfile.mem threshold.002 threshold.003
+ env LD_LIBRARY_PATH=${LIBSSSSDIR} ./${PROG} -t 2/10 < secretfile
+ ls -al ssss.0*
+ env LD_LIBRARY_PATH=${LIBSSSSDIR} ./${PROG} -j -o secretfile.mem ssss.002 ssss.003
-diff secretfile secretfile.mem
- rm threshold.*
- ./${PROG} -t 5/10 -i
- ls -al threshold.0*
- ./${PROG} -j threshold.004 threshold.002 threshold.003 threshold.005 threshold.007
- rm -f secretfile.recons secretfile.0* secretfile secretfile.mem threshold.*
+ rm ssss.*
+ env LD_LIBRARY_PATH=${LIBSSSSDIR} ./${PROG} -t 5/10 -i
+ ls -al ssss.0*
+ env LD_LIBRARY_PATH=${LIBSSSSDIR} ./${PROG} -j ssss.004 ssss.002 ssss.003 ssss.005 ssss.007
+ rm -f secretfile.recons secretfile.0* secretfile secretfile.mem ssss.*
