Update of ntl to 5.1a. Change build system to use libtool for
shared libraries. Changes between NTL 5.0c and 5.1a Some minor fixes and additions. Completely backward compatible. * Added a routine LatticeSolve() for finding integer solutions to linear systems of integer equations. * Modified the stragey used by the LLL() and image() routines in the LLL package to deal with linear dependencies. The new strategy guarantees better worst-case bounds on the sizes of intermediate values. I'm not sure if it will have any serious practical impact, though. * Added some "partial ISO modes" so that one can use some of the features of Standard C++, even if ones compiler does not yet support all of the features. * Bug fix: routine determnant() in mat_GF2.h was not visible to the linker because of a typo in mat_GF2.c. * Made a "smarter" script for selecting the GetTime() function. This fixes an installation problem on Cygwin/Windows 95 platforms. I hope it doesn't create more problems than it solves, though. * Added some extra documentation for installation under Windows/MS Visual C++. * Changed some names like c_lip.c to c_lip_impl.h. This should avoid some potential installation problems. * Throw away first 256-bytes of arc4 streams to improve quality of the pseudo-random number generator. This may change the precise behavior of some programs. * Other minor, internal modifications.
This commit is contained in:
parent
2ce7de790a
commit
69cd7b797a
5 changed files with 169 additions and 45 deletions
|
@ -1,6 +1,6 @@
|
|||
# $NetBSD: Makefile,v 1.6 2001/05/03 22:16:51 jtb Exp $
|
||||
# $NetBSD: Makefile,v 1.7 2001/06/20 10:19:27 jtb Exp $
|
||||
|
||||
DISTNAME= ntl-5.0c
|
||||
DISTNAME= ntl-5.1a
|
||||
CATEGORIES= math devel
|
||||
MASTER_SITES= http://www.shoup.net/ntl/
|
||||
|
||||
|
@ -12,8 +12,8 @@ DEPENDS+= gmp>=3.1.1:../../devel/gmp
|
|||
|
||||
WRKSRC= ${WRKDIR}/${DISTNAME}/src
|
||||
|
||||
NO_CONFIGURE= #defined
|
||||
|
||||
NO_CONFIGURE= # defined
|
||||
USE_LIBTOOL= yes
|
||||
MAKEFILE= makefile
|
||||
|
||||
GMP_PREFIX_DEFAULT= ${LOCALBASE}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
$NetBSD: distinfo,v 1.2 2001/04/19 08:45:42 agc Exp $
|
||||
$NetBSD: distinfo,v 1.3 2001/06/20 10:19:27 jtb Exp $
|
||||
|
||||
SHA1 (ntl-5.0c.tar.gz) = 20603a3aeff1e3e3452d2537375896bc501c2504
|
||||
Size (ntl-5.0c.tar.gz) = 643341 bytes
|
||||
SHA1 (patch-aa) = 2ff062c9ebd80d274ab222e4a88ad433b2db1c00
|
||||
SHA1 (ntl-5.1a.tar.gz) = c1a3bb0d109b58b1024c855dd5b8fccba3848224
|
||||
Size (ntl-5.1a.tar.gz) = 646668 bytes
|
||||
SHA1 (patch-aa) = 3ccfea0d126993898e30d021b0f5c8764d37e7bb
|
||||
SHA1 (patch-ab) = 726bb373a3dc31c33763282c5cc7c07110a33f23
|
||||
SHA1 (patch-ac) = f6a1e211379e713aee4fb575cc2d92563cbdd6fd
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
$NetBSD: patch-aa,v 1.3 2001/04/13 00:45:05 jtb Exp $
|
||||
$NetBSD: patch-aa,v 1.4 2001/06/20 10:19:28 jtb Exp $
|
||||
|
||||
--- makefile.orig Sun Nov 19 14:11:21 2000
|
||||
--- makefile.orig Fri Jun 8 14:23:17 2001
|
||||
+++ makefile
|
||||
@@ -7,7 +7,7 @@
|
||||
###############################################################
|
||||
|
@ -42,8 +42,7 @@ $NetBSD: patch-aa,v 1.3 2001/04/13 00:45:05 jtb Exp $
|
|||
+#AR=ar
|
||||
# command to make a library
|
||||
|
||||
-ARFLAGS=ruv
|
||||
+#ARFLAGS=ruv
|
||||
ARFLAGS=ruv
|
||||
# arguments for AR
|
||||
|
||||
-RANLIB=ranlib
|
||||
|
@ -91,38 +90,62 @@ $NetBSD: patch-aa,v 1.3 2001/04/13 00:45:05 jtb Exp $
|
|||
# Set to -lgmp if using GMP, empty otherwise
|
||||
|
||||
###############################################################
|
||||
@@ -291,7 +291,7 @@
|
||||
@@ -285,11 +285,11 @@
|
||||
NTL_INCLUDE = -I../include -I.
|
||||
# NTL needs this to find its include files
|
||||
|
||||
-COMPILE = $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) -c
|
||||
-COMPILE_CXX = $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) -c
|
||||
+COMPILE = $(LIBTOOL) $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) -c
|
||||
+COMPILE_CXX = $(LIBTOOL) $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) -c
|
||||
|
||||
-LINK = $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
|
||||
-LINK_CXX = $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS_CXX)
|
||||
+LINK = $(LIBTOOL) $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
|
||||
+LINK_CXX = $(LIBTOOL) $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS_CXX)
|
||||
|
||||
|
||||
|
||||
@@ -298,14 +298,14 @@
|
||||
make setup2
|
||||
make setup3
|
||||
make setup4
|
||||
- make ntl.a
|
||||
+ make libntl.a
|
||||
+ make libntl.la
|
||||
|
||||
|
||||
# setup1 generates the file ../incluse/NTL/mach_desc.h
|
||||
@@ -325,9 +325,9 @@
|
||||
|
||||
setup1:
|
||||
$(COMPILE) MakeDescAux.c
|
||||
- $(LINK) -o MakeDesc MakeDesc.c MakeDescAux.o $(LDLIBS)
|
||||
+ $(LINK) -o MakeDesc MakeDesc.c MakeDescAux.lo $(LDLIBS)
|
||||
./MakeDesc
|
||||
mv mach_desc.h ../include/NTL/mach_desc.h
|
||||
|
||||
@@ -332,9 +332,9 @@
|
||||
sh Wizard $(WIZARD)
|
||||
|
||||
|
||||
-ntl.a: $(OBJ)
|
||||
- $(AR) $(ARFLAGS) ntl.a $(OBJ)
|
||||
- - $(RANLIB) ntl.a
|
||||
+libntl.a: $(OBJ)
|
||||
+ $(AR) $(ARFLAGS) $@ $(OBJ)
|
||||
+ - $(RANLIB) $@
|
||||
+libntl.la: $(OBJ)
|
||||
+ $(LIBTOOL) $(CC) -o libntl.la $(OBJ:.o=.lo) -rpath $(LIBDIR) \
|
||||
+ --version-info 0:0
|
||||
|
||||
lip.o: lip.c g_lip.c c_lip.c lip_gmp_aux.c
|
||||
lip.o: lip.c g_lip_impl.h c_lip_impl.h lip_gmp_aux_impl.h
|
||||
$(COMPILE) $(GMP_INCDIR) lip.c
|
||||
@@ -344,7 +344,7 @@
|
||||
@@ -351,7 +351,7 @@
|
||||
$(COMPILE_CXX) $<
|
||||
|
||||
.c:
|
||||
- $(LINK_CXX) -o $@ $< ntl.a $(GMP_LIBDIR) $(GMP_LIB) $(LDLIBS_CXX)
|
||||
+ $(LINK_CXX) -o $@ $< libntl.a $(GMP_LIBDIR) $(GMP_LIB) $(LDLIBS_CXX)
|
||||
+ $(LINK_CXX) -o $@ $< libntl.la $(GMP_LIBDIR) $(GMP_LIB) $(LDLIBS_CXX)
|
||||
|
||||
#################################################################
|
||||
#
|
||||
@@ -372,17 +372,24 @@
|
||||
@@ -379,17 +379,12 @@
|
||||
|
||||
|
||||
install:
|
||||
|
@ -137,47 +160,58 @@ $NetBSD: patch-aa,v 1.3 2001/04/13 00:45:05 jtb Exp $
|
|||
- mkdir $(DOCDIR)/NTL
|
||||
- cp ../doc/*.txt $(DOCDIR)/NTL
|
||||
- cp ../doc/*.html $(DOCDIR)/NTL
|
||||
+ $(BSD_INSTALL_DATA_DIR) $(LIBDIR)
|
||||
+ $(BSD_INSTALL_DATA) libntl.a $(LIBDIR)
|
||||
+ $(BSD_INSTALL_DATA_DIR) $(INCLUDEDIR)
|
||||
+ $(LIBTOOL) $(BSD_INSTALL_DATA) libntl.la $(LIBDIR)
|
||||
+ $(BSD_INSTALL_DATA_DIR) $(INCLUDEDIR)/NTL
|
||||
+ @for d in ../include/NTL/*.h; do \
|
||||
+ c="$(BSD_INSTALL_DATA) $$d $(INCLUDEDIR)/NTL/"; \
|
||||
+ echo $$c; $$c; \
|
||||
+ done
|
||||
+ $(BSD_INSTALL_DATA_DIR) $(DOCDIR)
|
||||
+ $(BSD_INSTALL_DATA) ../include/NTL/*.h $(INCLUDEDIR)/NTL
|
||||
+ $(BSD_INSTALL_DATA_DIR) $(DOCDIR)/NTL
|
||||
+ @for d in ../doc/*.txt; do \
|
||||
+ c="$(BSD_INSTALL_DATA) $$d $(DOCDIR)/NTL/"; \
|
||||
+ echo $$c; $$c; \
|
||||
+ done
|
||||
+ @for d in ../doc/*.html; do \
|
||||
+ c="$(BSD_INSTALL_DATA) $$d $(DOCDIR)/NTL/"; \
|
||||
+ echo $$c; $$c; \
|
||||
+ done
|
||||
+ $(BSD_INSTALL_DATA) ../doc/*.txt $(DOCDIR)/NTL
|
||||
+ $(BSD_INSTALL_DATA) ../doc/*.html $(DOCDIR)/NTL
|
||||
|
||||
|
||||
uninstall:
|
||||
@@ -402,16 +409,16 @@
|
||||
@@ -409,16 +404,16 @@
|
||||
#################################################################
|
||||
|
||||
clobber:
|
||||
- - rm ntl.a mach_desc.h ../include/NTL/mach_desc.h GetTime.c
|
||||
- - rm lip_gmp_aux.c ../include/NTL/gmp_aux.h
|
||||
+ - rm -f libntl.a mach_desc.h ../include/NTL/mach_desc.h GetTime.c
|
||||
+ - rm -f lip_gmp_aux.c ../include/NTL/gmp_aux.h
|
||||
- - rm lip_gmp_aux_impl.h ../include/NTL/gmp_aux.h
|
||||
+ - rm -fr libntl.la .libs mach_desc.h ../include/NTL/mach_desc.h GetTime.c
|
||||
+ - rm -f lip_gmp_aux_impl.h ../include/NTL/gmp_aux.h
|
||||
- sh RemoveProg $(PROGS) MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux
|
||||
- - rm *.o
|
||||
- - rm -r small
|
||||
+ - rm -f *.o
|
||||
+ - rm -f *.o *.lo
|
||||
+ - rm -fr small
|
||||
|
||||
clean:
|
||||
- - rm *.o
|
||||
+ - rm -f *.o
|
||||
+ - rm -f *.o *.lo
|
||||
- sh RemoveProg MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux
|
||||
- - rm -r small
|
||||
+ - rm -fr small
|
||||
|
||||
#################################################################
|
||||
#
|
||||
@@ -464,17 +459,17 @@
|
||||
WOBJ = $(WO2)
|
||||
|
||||
|
||||
-wntl.a: $(WOBJ)
|
||||
- $(AR) $(ARFLAGS) wntl.a $(WOBJ)
|
||||
- - $(RANLIB) wntl.a
|
||||
+libwntl.la: $(WOBJ)
|
||||
+ $(LIBTOOL) $(CC) -o libwntl.la $(WOBJ:.o=.lo) -rpath $(LIBDIR) \
|
||||
+ --version-info 0:0
|
||||
|
||||
|
||||
|
||||
MulTimeTest:
|
||||
- $(LINK_CXX) -o MulTimeTest MulTimeTest.c wntl.a $(GMP_LIBDIR) $(GMP_LIB) $(LDLIBS_CXX)
|
||||
+ $(LINK_CXX) -o MulTimeTest MulTimeTest.c libwntl.la $(GMP_LIBDIR) $(GMP_LIB) $(LDLIBS_CXX)
|
||||
|
||||
PolyTimeTest:
|
||||
- $(LINK_CXX) -o PolyTimeTest PolyTimeTest.c wntl.a $(GMP_LIBDIR) $(GMP_LIB) $(LDLIBS_CXX)
|
||||
+ $(LINK_CXX) -o PolyTimeTest PolyTimeTest.c libwntl.la $(GMP_LIBDIR) $(GMP_LIB) $(LDLIBS_CXX)
|
||||
|
||||
InitSettings:
|
||||
$(LINK_CXX) -o InitSettings InitSettings.c $(LDLIBS_CXX)
|
||||
|
|
85
math/ntl/patches/patch-ac
Normal file
85
math/ntl/patches/patch-ac
Normal file
|
@ -0,0 +1,85 @@
|
|||
$NetBSD: patch-ac,v 1.1 2001/06/20 10:19:28 jtb Exp $
|
||||
|
||||
--- WizardAux.orig Fri Jun 8 14:23:16 2001
|
||||
+++ WizardAux
|
||||
@@ -12,7 +12,7 @@
|
||||
cat clr_LONG_LONG clr_AVOID_FLOAT > best1
|
||||
cat clr_LONG_LONG clr_AVOID_FLOAT clr_TBL_REM clr_AVOID_BRANCHING clr_FFT_PIPELINE set_WIZARD_HACK isettings > isettings1
|
||||
sed -f isettings1 config_template > ../include/NTL/config.h
|
||||
-make wntl.a
|
||||
+make libwntl.la
|
||||
sh RemoveProg MulTimeTest
|
||||
|
||||
if test -f NO_GMP_LIP
|
||||
@@ -33,7 +33,7 @@
|
||||
cat clr_LONG_LONG set_AVOID_FLOAT clr_TBL_REM clr_AVOID_BRANCHING clr_FFT_PIPELINE set_WIZARD_HACK isettings > isettings1
|
||||
sed -f isettings1 config_template > ../include/NTL/config.h
|
||||
rm lip.o
|
||||
- make wntl.a
|
||||
+ make libwntl.la
|
||||
sh RemoveProg MulTimeTest
|
||||
make MulTimeTest
|
||||
if test -f MulTimeTest
|
||||
@@ -55,7 +55,7 @@
|
||||
cat set_LONG_LONG clr_AVOID_FLOAT clr_TBL_REM clr_AVOID_BRANCHING clr_FFT_PIPELINE set_WIZARD_HACK isettings > isettings1
|
||||
sed -f isettings1 config_template > ../include/NTL/config.h
|
||||
rm lip.o
|
||||
- make wntl.a
|
||||
+ make libwntl.la
|
||||
sh RemoveProg MulTimeTest
|
||||
make MulTimeTest
|
||||
if test -f MulTimeTest
|
||||
@@ -79,7 +79,7 @@
|
||||
cat best1 clr_TBL_REM clr_AVOID_BRANCHING clr_FFT_PIPELINE set_WIZARD_HACK isettings > isettings1
|
||||
sed -f isettings1 config_template > ../include/NTL/config.h
|
||||
rm lip.o
|
||||
-make wntl.a
|
||||
+make libwntl.la
|
||||
sh RemoveProg PolyTimeTest
|
||||
make PolyTimeTest
|
||||
if test -f PolyTimeTest
|
||||
@@ -95,7 +95,7 @@
|
||||
cat best1 clr_TBL_REM clr_AVOID_BRANCHING set_FFT_PIPELINE set_WIZARD_HACK isettings > isettings1
|
||||
sed -f isettings1 config_template > ../include/NTL/config.h
|
||||
rm FFT.o
|
||||
-make wntl.a
|
||||
+make libwntl.la
|
||||
sh RemoveProg PolyTimeTest
|
||||
make PolyTimeTest
|
||||
if test -f PolyTimeTest
|
||||
@@ -123,7 +123,7 @@
|
||||
cat best1 set_TBL_REM clr_AVOID_BRANCHING best2 set_WIZARD_HACK isettings > isettings1
|
||||
sed -f isettings1 config_template > ../include/NTL/config.h
|
||||
rm lip.o
|
||||
- make wntl.a
|
||||
+ make libwntl.la
|
||||
sh RemoveProg PolyTimeTest
|
||||
make PolyTimeTest
|
||||
if test -f PolyTimeTest
|
||||
@@ -151,7 +151,7 @@
|
||||
cat best1 clr_TBL_REM set_AVOID_BRANCHING clr_FFT_PIPELINE set_WIZARD_HACK isettings > isettings1
|
||||
sed -f isettings1 config_template > ../include/NTL/config.h
|
||||
rm *.o
|
||||
-make wntl.a
|
||||
+make libwntl.la
|
||||
sh RemoveProg PolyTimeTest
|
||||
make PolyTimeTest
|
||||
if test -f PolyTimeTest
|
||||
@@ -167,7 +167,7 @@
|
||||
cat best1 clr_TBL_REM set_AVOID_BRANCHING set_FFT_PIPELINE set_WIZARD_HACK isettings > isettings1
|
||||
sed -f isettings1 config_template > ../include/NTL/config.h
|
||||
rm FFT.o
|
||||
-make wntl.a
|
||||
+make libwntl.la
|
||||
sh RemoveProg PolyTimeTest
|
||||
make PolyTimeTest
|
||||
if test -f PolyTimeTest
|
||||
@@ -196,7 +196,7 @@
|
||||
cat best1 set_TBL_REM set_AVOID_BRANCHING best2 set_WIZARD_HACK isettings > isettings1
|
||||
sed -f isettings1 config_template > ../include/NTL/config.h
|
||||
rm lip.o
|
||||
- make wntl.a
|
||||
+ make libwntl.la
|
||||
sh RemoveProg PolyTimeTest
|
||||
make PolyTimeTest
|
||||
if test -f PolyTimeTest
|
|
@ -1,4 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.1.1.1 2001/01/26 23:46:22 jtb Exp $
|
||||
@comment $NetBSD: PLIST,v 1.2 2001/06/20 10:19:28 jtb Exp $
|
||||
include/NTL/FFT.h
|
||||
include/NTL/FacVec.h
|
||||
include/NTL/GF2.h
|
||||
|
@ -89,6 +89,10 @@ include/NTL/vector.h
|
|||
include/NTL/version.h
|
||||
include/NTL/xdouble.h
|
||||
lib/libntl.a
|
||||
lib/libntl.la
|
||||
lib/libntl.so
|
||||
lib/libntl.so.0
|
||||
lib/libntl.so.0.0
|
||||
share/doc/NTL/GF2.txt
|
||||
share/doc/NTL/GF2E.txt
|
||||
share/doc/NTL/GF2EX.txt
|
||||
|
|
Loading…
Reference in a new issue