diff options
author | wiz <wiz@pkgsrc.org> | 2020-06-08 13:42:38 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2020-06-08 13:42:38 +0000 |
commit | 5adfc65f66d5ef1008a8e11694afd082a6a72168 (patch) | |
tree | 13a9ecce59888cb5d12c1e12a8642f1575f375d0 /math | |
parent | 990b2147837edd000c9a1886dfc7162449bdc9a0 (diff) | |
download | pkgsrc-5adfc65f66d5ef1008a8e11694afd082a6a72168.tar.gz |
ntl: update to 11.4.3.
7 years of changes. For details see
https://www.shoup.net/ntl/doc/tour-changes.html
Remove libtool patch. This is too big to be maintained in
pkgsrc and should be upstreamed if deemed interesting enough.
Bump API requirements in bl3.mk because of this change, and
also because HElib (the only consumer of this library in pkgsrc)
needs the new version anyway and will be updated next.
Diffstat (limited to 'math')
-rw-r--r-- | math/ntl/Makefile | 16 | ||||
-rw-r--r-- | math/ntl/PLIST | 101 | ||||
-rw-r--r-- | math/ntl/buildlink3.mk | 7 | ||||
-rw-r--r-- | math/ntl/distinfo | 14 | ||||
-rw-r--r-- | math/ntl/patches/patch-aa | 306 | ||||
-rw-r--r-- | math/ntl/patches/patch-ab | 15 | ||||
-rw-r--r-- | math/ntl/patches/patch-ac | 15 | ||||
-rw-r--r-- | math/ntl/patches/patch-mfile | 15 |
8 files changed, 126 insertions, 363 deletions
diff --git a/math/ntl/Makefile b/math/ntl/Makefile index 7007fb83061..6760ceb0d16 100644 --- a/math/ntl/Makefile +++ b/math/ntl/Makefile @@ -1,23 +1,21 @@ -# $NetBSD: Makefile,v 1.35 2020/01/26 17:31:39 rillig Exp $ +# $NetBSD: Makefile,v 1.36 2020/06/08 13:42:38 wiz Exp $ -DISTNAME= ntl-6.0.0 -PKGREVISION= 6 +DISTNAME= ntl-11.4.3 CATEGORIES= math devel -MASTER_SITES= http://www.shoup.net/ntl/ +MASTER_SITES= https://www.shoup.net/ntl/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://www.shoup.net/ntl/ COMMENT= C++ library for doing number theory - -MAKE_JOBS_SAFE= no +LICENSE= gnu-lgpl-v2.1 WRKSRC= ${WRKDIR}/${DISTNAME}/src -NO_CONFIGURE= yes +HAS_CONFIGURE= yes +CONFIGURE_ARGS+= DEF_PREFIX=${PREFIX} USE_LANGUAGES= c c++ USE_TOOLS+= perl -USE_LIBTOOL= yes MAKE_FILE= makefile -INSTALLATION_DIRS= lib +TEST_TARGET= check .include "../../devel/gmp/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/ntl/PLIST b/math/ntl/PLIST index 4ec38b83a38..56a7e31a38e 100644 --- a/math/ntl/PLIST +++ b/math/ntl/PLIST @@ -1,5 +1,9 @@ -@comment $NetBSD: PLIST,v 1.5 2012/01/02 23:42:28 dholland Exp $ +@comment $NetBSD: PLIST,v 1.6 2020/06/08 13:42:38 wiz Exp $ +include/NTL/ALL_FEATURES.h +include/NTL/BasicThreadPool.h +include/NTL/ConfigLog.h include/NTL/FFT.h +include/NTL/FFT_impl.h include/NTL/FacVec.h include/NTL/GF2.h include/NTL/GF2E.h @@ -8,27 +12,45 @@ include/NTL/GF2EXFactoring.h include/NTL/GF2X.h include/NTL/GF2XFactoring.h include/NTL/GF2XVec.h +include/NTL/HAVE_ALIGNED_ARRAY.h +include/NTL/HAVE_AVX.h +include/NTL/HAVE_AVX2.h +include/NTL/HAVE_AVX512F.h +include/NTL/HAVE_BUILTIN_CLZL.h +include/NTL/HAVE_CHRONO_TIME.h +include/NTL/HAVE_COPY_TRAITS1.h +include/NTL/HAVE_COPY_TRAITS2.h +include/NTL/HAVE_FMA.h +include/NTL/HAVE_LL_TYPE.h +include/NTL/HAVE_MACOS_TIME.h +include/NTL/HAVE_PCLMUL.h +include/NTL/HAVE_POSIX_TIME.h +include/NTL/HAVE_SSSE3.h include/NTL/HNF.h include/NTL/LLL.h +include/NTL/Lazy.h +include/NTL/LazyTable.h +include/NTL/MatPrime.h +include/NTL/PD.h +include/NTL/PackageInfo.h +include/NTL/REPORT_ALL_FEATURES.h include/NTL/RR.h -include/NTL/SPMM_ASM.h +include/NTL/SmartPtr.h include/NTL/WordVector.h include/NTL/ZZ.h include/NTL/ZZVec.h include/NTL/ZZX.h include/NTL/ZZXFactoring.h +include/NTL/ZZ_limbs.h include/NTL/ZZ_p.h include/NTL/ZZ_pE.h include/NTL/ZZ_pEX.h include/NTL/ZZ_pEXFactoring.h include/NTL/ZZ_pX.h include/NTL/ZZ_pXFactoring.h -include/NTL/c_lip.h include/NTL/config.h include/NTL/ctools.h -include/NTL/def_config.h include/NTL/fileio.h -include/NTL/g_lip.h include/NTL/gmp_aux.h include/NTL/lip.h include/NTL/lzz_p.h @@ -59,7 +81,10 @@ include/NTL/pair_ZZ_pEX_long.h include/NTL/pair_ZZ_pX_long.h include/NTL/pair_lzz_pEX_long.h include/NTL/pair_lzz_pX_long.h +include/NTL/pd_FFT.h include/NTL/quad_float.h +include/NTL/sp_arith.h +include/NTL/thread.h include/NTL/tools.h include/NTL/vec_GF2.h include/NTL/vec_GF2E.h @@ -89,26 +114,56 @@ include/NTL/vec_xdouble.h include/NTL/vector.h include/NTL/version.h include/NTL/xdouble.h -lib/libntl.la +lib/libntl.a +share/doc/NTL/BasicThreadPool.cpp.html +share/doc/NTL/BasicThreadPool.txt +share/doc/NTL/GF2.cpp.html share/doc/NTL/GF2.txt +share/doc/NTL/GF2E.cpp.html share/doc/NTL/GF2E.txt +share/doc/NTL/GF2EX.cpp.html share/doc/NTL/GF2EX.txt +share/doc/NTL/GF2EXFactoring.cpp.html share/doc/NTL/GF2EXFactoring.txt +share/doc/NTL/GF2X.cpp.html share/doc/NTL/GF2X.txt +share/doc/NTL/GF2XFactoring.cpp.html share/doc/NTL/GF2XFactoring.txt +share/doc/NTL/GF2XVec.cpp.html share/doc/NTL/GF2XVec.txt +share/doc/NTL/HNF.cpp.html share/doc/NTL/HNF.txt +share/doc/NTL/LLL.cpp.html share/doc/NTL/LLL.txt +share/doc/NTL/Lazy.cpp.html +share/doc/NTL/Lazy.txt +share/doc/NTL/LazyTable.cpp.html +share/doc/NTL/LazyTable.txt +share/doc/NTL/RR.cpp.html share/doc/NTL/RR.txt +share/doc/NTL/SmartPtr.cpp.html +share/doc/NTL/SmartPtr.txt +share/doc/NTL/ZZ.cpp.html share/doc/NTL/ZZ.txt +share/doc/NTL/ZZVec.cpp.html share/doc/NTL/ZZVec.txt +share/doc/NTL/ZZX.cpp.html share/doc/NTL/ZZX.txt +share/doc/NTL/ZZXFactoring.cpp.html share/doc/NTL/ZZXFactoring.txt +share/doc/NTL/ZZ_limbs.cpp.html +share/doc/NTL/ZZ_limbs.txt +share/doc/NTL/ZZ_p.cpp.html share/doc/NTL/ZZ_p.txt +share/doc/NTL/ZZ_pE.cpp.html share/doc/NTL/ZZ_pE.txt +share/doc/NTL/ZZ_pEX.cpp.html share/doc/NTL/ZZ_pEX.txt +share/doc/NTL/ZZ_pEXFactoring.cpp.html share/doc/NTL/ZZ_pEXFactoring.txt +share/doc/NTL/ZZ_pX.cpp.html share/doc/NTL/ZZ_pX.txt +share/doc/NTL/ZZ_pXFactoring.cpp.html share/doc/NTL/ZZ_pXFactoring.txt share/doc/NTL/arrow1.gif share/doc/NTL/arrow2.gif @@ -117,28 +172,49 @@ share/doc/NTL/config.txt share/doc/NTL/conversions.txt share/doc/NTL/copying.txt share/doc/NTL/flags.txt +share/doc/NTL/lzz_p.cpp.html share/doc/NTL/lzz_p.txt +share/doc/NTL/lzz_pE.cpp.html share/doc/NTL/lzz_pE.txt +share/doc/NTL/lzz_pEX.cpp.html share/doc/NTL/lzz_pEX.txt +share/doc/NTL/lzz_pEXFactoring.cpp.html share/doc/NTL/lzz_pEXFactoring.txt +share/doc/NTL/lzz_pX.cpp.html share/doc/NTL/lzz_pX.txt +share/doc/NTL/lzz_pXFactoring.cpp.html share/doc/NTL/lzz_pXFactoring.txt +share/doc/NTL/mat_GF2.cpp.html share/doc/NTL/mat_GF2.txt +share/doc/NTL/mat_GF2E.cpp.html share/doc/NTL/mat_GF2E.txt +share/doc/NTL/mat_RR.cpp.html share/doc/NTL/mat_RR.txt +share/doc/NTL/mat_ZZ.cpp.html share/doc/NTL/mat_ZZ.txt +share/doc/NTL/mat_ZZ_p.cpp.html share/doc/NTL/mat_ZZ_p.txt +share/doc/NTL/mat_ZZ_pE.cpp.html share/doc/NTL/mat_ZZ_pE.txt +share/doc/NTL/mat_lzz_p.cpp.html share/doc/NTL/mat_lzz_p.txt +share/doc/NTL/mat_lzz_pE.cpp.html share/doc/NTL/mat_lzz_pE.txt +share/doc/NTL/mat_poly_ZZ.cpp.html share/doc/NTL/mat_poly_ZZ.txt +share/doc/NTL/mat_poly_ZZ_p.cpp.html share/doc/NTL/mat_poly_ZZ_p.txt +share/doc/NTL/mat_poly_lzz_p.cpp.html share/doc/NTL/mat_poly_lzz_p.txt +share/doc/NTL/matrix.cpp.html share/doc/NTL/matrix.txt share/doc/NTL/names.txt +share/doc/NTL/pair.cpp.html share/doc/NTL/pair.txt +share/doc/NTL/quad_float.cpp.html share/doc/NTL/quad_float.txt share/doc/NTL/sedscript.txt +share/doc/NTL/tools.cpp.html share/doc/NTL/tools.txt share/doc/NTL/tour-ack.html share/doc/NTL/tour-changes.html @@ -148,6 +224,7 @@ share/doc/NTL/tour-ex3.html share/doc/NTL/tour-ex4.html share/doc/NTL/tour-ex5.html share/doc/NTL/tour-ex6.html +share/doc/NTL/tour-ex7.html share/doc/NTL/tour-examples.html share/doc/NTL/tour-gf2x.html share/doc/NTL/tour-gmp.html @@ -155,21 +232,31 @@ share/doc/NTL/tour-impl.html share/doc/NTL/tour-intro.html share/doc/NTL/tour-modules.html share/doc/NTL/tour-roadmap.html -share/doc/NTL/tour-stdcxx.html share/doc/NTL/tour-struct.html share/doc/NTL/tour-time.html share/doc/NTL/tour-tips.html share/doc/NTL/tour-unix.html share/doc/NTL/tour-win.html share/doc/NTL/tour.html +share/doc/NTL/vec_GF2.cpp.html share/doc/NTL/vec_GF2.txt +share/doc/NTL/vec_GF2E.cpp.html share/doc/NTL/vec_GF2E.txt +share/doc/NTL/vec_RR.cpp.html share/doc/NTL/vec_RR.txt +share/doc/NTL/vec_ZZ.cpp.html share/doc/NTL/vec_ZZ.txt +share/doc/NTL/vec_ZZ_p.cpp.html share/doc/NTL/vec_ZZ_p.txt +share/doc/NTL/vec_ZZ_pE.cpp.html share/doc/NTL/vec_ZZ_pE.txt +share/doc/NTL/vec_lzz_p.cpp.html share/doc/NTL/vec_lzz_p.txt +share/doc/NTL/vec_lzz_pE.cpp.html share/doc/NTL/vec_lzz_pE.txt +share/doc/NTL/vector.cpp.html share/doc/NTL/vector.txt +share/doc/NTL/version.cpp.html share/doc/NTL/version.txt +share/doc/NTL/xdouble.cpp.html share/doc/NTL/xdouble.txt diff --git a/math/ntl/buildlink3.mk b/math/ntl/buildlink3.mk index 69e3320cf43..51be647fb79 100644 --- a/math/ntl/buildlink3.mk +++ b/math/ntl/buildlink3.mk @@ -1,14 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.9 2013/05/18 18:32:19 agc Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2020/06/08 13:42:38 wiz Exp $ BUILDLINK_TREE+= ntl .if !defined(NTL_BUILDLINK3_MK) NTL_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.ntl+= ntl>=6.0.0 -BUILDLINK_ABI_DEPENDS.ntl+= ntl>=6.0.0 +BUILDLINK_API_DEPENDS.ntl+= ntl>=11.4.3 BUILDLINK_PKGSRCDIR.ntl?= ../../math/ntl +BUILDLINK_DEPMETHOD.ntl?= build + .include "../../devel/gmp/buildlink3.mk" .endif # NTL_BUILDLINK3_MK diff --git a/math/ntl/distinfo b/math/ntl/distinfo index 59075a369ff..4d1aa0d214f 100644 --- a/math/ntl/distinfo +++ b/math/ntl/distinfo @@ -1,9 +1,7 @@ -$NetBSD: distinfo,v 1.9 2015/11/03 23:33:37 agc Exp $ +$NetBSD: distinfo,v 1.10 2020/06/08 13:42:38 wiz Exp $ -SHA1 (ntl-6.0.0.tar.gz) = ee71b1c6a94f34b8a3c226502a0a0c6c2d1bc3f9 -RMD160 (ntl-6.0.0.tar.gz) = 2be966b4f2ecb7cd957ca42b41836459b9a29bd9 -SHA512 (ntl-6.0.0.tar.gz) = fa1f1745e75c7588ca5af437648ab0844281f5c6e6a22a3bcaf0409792f3d4c70f0b8050823d90d19673ebcecae18ce6d39e6c9b1fec9f2d79f87b788b58d261 -Size (ntl-6.0.0.tar.gz) = 714741 bytes -SHA1 (patch-aa) = 4f07d991930fa8bac5cf586693cce0b3e8679527 -SHA1 (patch-ab) = b91b052c88ea49a4138723259a312c43148737cc -SHA1 (patch-ac) = 99c32692cd27ea63e966c3fe1df0b8a6373f5018 +SHA1 (ntl-11.4.3.tar.gz) = f4c7dc1fd448b499ef98549e8702b320ba6a7830 +RMD160 (ntl-11.4.3.tar.gz) = 362e62354c160daeda3af7395df79385b0c582f5 +SHA512 (ntl-11.4.3.tar.gz) = 26515ed73c8e74d0ff8bc161101f1b815f2c23e4bd633cc426f6da2741c6d8f43ad4f8df2cb7ad915475933599e0ee01cc360e75569f6f5d49cb5e5eae37b3f5 +Size (ntl-11.4.3.tar.gz) = 2274421 bytes +SHA1 (patch-mfile) = c40f7c85a6a5719ab30c4423f296d121b25018db diff --git a/math/ntl/patches/patch-aa b/math/ntl/patches/patch-aa deleted file mode 100644 index 1b489f30327..00000000000 --- a/math/ntl/patches/patch-aa +++ /dev/null @@ -1,306 +0,0 @@ -$NetBSD: patch-aa,v 1.8 2013/05/18 18:32:19 agc Exp $ - -- configure for pkgsrc -- libtoolize - ---- makefile.orig 2013-02-15 06:44:27.000000000 -0800 -+++ makefile 2013-05-07 10:56:46.000000000 -0700 -@@ -7,7 +7,7 @@ - ############################################################### - - --CC=gcc -+#CC=gcc - # A C or C++ compiler, e. g., gcc, cc, xlc. - # There are a few components written in C which may be compiled - # under C++, but C compilers tend to generate slightly better code. -@@ -15,11 +15,11 @@ - # compatible code. - - --CXX=g++ -+#CXX=g++ - # A C++ compiler, e.g., g++, CC, xlC - - --CFLAGS=-O2 -+#CFLAGS=-O2 - # Flags for the C compiler - # Some useful flags: - # -O2 -- recommended level of optimization -@@ -32,7 +32,7 @@ - - - --CXXFLAGS=$(CFLAGS) -+#CXXFLAGS=$(CFLAGS) - # Flags for the C++ compiler (usually the same as CFLAGS) - # Some useful flags: - # -+ -- needed with xlC to make it treat .c files as C++ files -@@ -41,16 +41,16 @@ - # The defaults should almost always be OK. - - --AR=ar -+#AR=ar - # command to make a library - --ARFLAGS=ruv -+#ARFLAGS=ruv - # arguments for AR - --RANLIB=ranlib -+#RANLIB=ranlib - # set to echo if you want to disable it completely - --LDFLAGS= -+#LDFLAGS= - # arguments for linker for C programs - - LDFLAGS_CXX=$(LDFLAGS) -@@ -62,15 +62,15 @@ - LDLIBS_CXX=$(LDLIBS) - # libraries for linking C++ programs - --CPPFLAGS= -+#CPPFLAGS= - # arguments for the C preprocessor - --LIBTOOL=libtool -+#LIBTOOL=libtool - # libtool command - --DEF_PREFIX=/usr/local -+DEF_PREFIX=/nonexistent - --PREFIX=$(DEF_PREFIX) -+#PREFIX=$(DEF_PREFIX) - LIBDIR=$(PREFIX)/lib - INCLUDEDIR=$(PREFIX)/include - DOCDIR=$(PREFIX)/share/doc -@@ -92,17 +92,17 @@ - ############################################################### - - --GMP_PREFIX=$(DEF_PREFIX) -+GMP_PREFIX=${BUILDLINK_PREFIX.gmp} - --GMP_INCDIR=$(GMP_PREFIX)/include -+GMP_INCDIR= ${GMP_PREFIX}/include - # directory containing gmp.h if using GMP - --GMP_LIBDIR=$(GMP_PREFIX)/lib -+GMP_LIBDIR= ${GMP_PREFIX}/lib - # directory containing libgmp.a if using GMP - --GMP_OPT_INCDIR=# -I$(GMP_INCDIR) # GMPI --GMP_OPT_LIBDIR=# -L$(GMP_LIBDIR) # GMPL --GMP_OPT_LIB=# -lgmp # GMP -+GMP_OPT_INCDIR= -I$(GMP_INCDIR) # GMP -+GMP_OPT_LIBDIR= -Wl,-R$(GMP_LIBDIR) -L$(GMP_LIBDIR) # GMP -+GMP_OPT_LIB= -lgmp # GMP - # uncomment these if using GMP - - -@@ -116,7 +116,7 @@ - # - ############################################################### - --GF2X_PREFIX=$(DEF_PREFIX) -+GF2X_PREFIX=/nonexistent - - GF2X_INCDIR=$(GF2X_PREFIX)/include - # directory containing gf2x.h if using gf2x -@@ -125,7 +125,7 @@ - # directory containing libgf2x.a - - GF2X_OPT_INCDIR=# -I$(GF2X_INCDIR) # GF2X --GF2X_OPT_LIBDIR=# -L$(GF2X_LIBDIR) # GF2X -+GF2X_OPT_LIBDIR=# -Wl,-R$(GF2X_LIBDIR) -L$(GF2X_LIBDIR) # GF2X - GF2X_OPT_LIB=# -lgf2x # GF2X - # uncomment these if using gf2x - -@@ -179,7 +179,7 @@ - S01=FFT.c FacVec.c GF2.c GF2E.c GF2EX.c GF2EXFactoring.c GF2X.c GF2X1.c - S02=$(S01) GF2XFactoring.c GF2XVec.c HNF.c ctools.c LLL.c LLL_FP.c LLL_QP.c - S03=$(S02) LLL_RR.c LLL_XD.c RR.c WordVector.c ZZ.c ZZVec.c ZZX.c ZZX1.c --S04=$(S03) ZZXCharPoly.c ZZXFactoring.c ZZ_p.c ZZ_pE.c ZZ_pEX.c -+S04=$(S03) ZZXCharPoly.c ZZXFactoring.c ZZ_p.c ZZ_pE.c ZZ_pEX.c - S05=$(S04) ZZ_pEXFactoring.c ZZ_pX.c ZZ_pX1.c ZZ_pXCharPoly.c - S06=$(S05) ZZ_pXFactoring.c fileio.c lip.c lzz_p.c lzz_pE.c lzz_pEX.c - S07=$(S06) lzz_pEXFactoring.c lzz_pX.c lzz_pX1.c -@@ -233,9 +233,9 @@ - - # test data - --TD1=BerlekampTestIn BerlekampTestOut CanZassTestIn CanZassTestOut --TD2=$(TD1) ZZXFacTestIn ZZXFacTestOut MoreFacTestIn LLLTestIn LLLTestOut RRTestIn RRTestOut --TD3=$(TD2) MatrixTestIn MatrixTestOut CharPolyTestIn -+TD1=BerlekampTestIn BerlekampTestOut CanZassTestIn CanZassTestOut -+TD2=$(TD1) ZZXFacTestIn ZZXFacTestOut MoreFacTestIn LLLTestIn LLLTestOut RRTestIn RRTestOut -+TD3=$(TD2) MatrixTestIn MatrixTestOut CharPolyTestIn - TD4=$(TD3) CharPolyTestOut QuadTestIn QuadTestOut - - TD = $(TD4) -@@ -313,11 +313,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) --mode=compile $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) -c -+COMPILE_CXX = $(LIBTOOL) --mode=compile $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) -c - --LINK = $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) --LINK_CXX = $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS_CXX) -+LINK = $(LIBTOOL) --mode=link $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -+LINK_CXX = $(LIBTOOL) --mode=link $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS_CXX) - - - -@@ -331,7 +331,7 @@ - make setup2 - make setup3 - make setup4 -- make ntl.a -+ make libntl.a - touch all - - -@@ -339,7 +339,7 @@ - - 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 - -@@ -366,10 +366,16 @@ - sh Wizard $(WIZARD) - - --ntl.a: $(OBJ) -- $(AR) $(ARFLAGS) ntl.a $(OBJ) #LSTAT -- - $(RANLIB) ntl.a #LSTAT --# $(LIBTOOL) --mode=link $(LINK_CXX) -o libntl.la $(OBJ:.o=.lo) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS_CXX) -rpath $(LIBDIR) -version-info `cat VERSION_INFO` #LSHAR -+libntl.a: $(OBJ) -+ $(LIBTOOL) --mode=link $(CXX) -o libntl.la $(OBJ:.o=.lo) \ -+ $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) \ -+ $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) \ -+ $(LDLIBS_CXX) \ -+ -rpath $(LIBDIR) \ -+ -version-info `cat VERSION_INFO` -+# $(AR) $(ARFLAGS) ntl.a $(OBJ) #LSTAT -+# - $(RANLIB) ntl.a #LSTAT -+## $(LIBTOOL) --mode=link $(LINK_CXX) -o libntl.la $(OBJ:.o=.lo) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS_CXX) -rpath $(LIBDIR) -version-info `cat VERSION_INFO` #LSHAR - - LCOMP= #LSTAT - # LCOMP=$(LIBTOOL) --mode=compile #LSHAR -@@ -390,7 +396,7 @@ - $(LCOMP) $(COMPILE_CXX) $(GF2X_OPT_INCDIR) $< - - .c: -- $(LINK_CXX) -o $@ $< ntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS_CXX) #LSTAT -+ $(LINK_CXX) -o $@ $< libntl.la $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS_CXX) #LSTAT - # $(LIBTOOL) --mode=link $(LINK_CXX) -o $@ $< libntl.la #LSHAR - - ################################################################# -@@ -424,23 +430,29 @@ - - - install: -- mkdir -p -m 755 $(INCLUDEDIR) -- rm -rf $(INCLUDEDIR)/NTL -- mkdir -m 755 $(INCLUDEDIR)/NTL -- cp -p ../include/NTL/*.h $(INCLUDEDIR)/NTL -- - chmod -R a+r $(INCLUDEDIR)/NTL -- mkdir -p -m 755 $(DOCDIR) -- rm -rf $(DOCDIR)/NTL -- mkdir -m 755 $(DOCDIR)/NTL -- cp -p ../doc/*.txt $(DOCDIR)/NTL -- cp -p ../doc/*.html $(DOCDIR)/NTL -- cp -p ../doc/*.gif $(DOCDIR)/NTL -- - chmod -R a+r $(DOCDIR)/NTL -- mkdir -p -m 755 $(LIBDIR) -- cp -p ntl.a $(LIBDIR)/libntl.a #LSTAT -- - chmod a+r $(LIBDIR)/libntl.a #LSTAT --# $(LIBTOOL) --mode=install cp -p libntl.la $(LIBDIR) #LSHAR -- -+# mkdir -p -m 755 $(INCLUDEDIR) -+# rm -rf $(INCLUDEDIR)/NTL -+# mkdir -m 755 $(INCLUDEDIR)/NTL -+# cp -p ../include/NTL/*.h $(INCLUDEDIR)/NTL -+# - chmod -R a+r $(INCLUDEDIR)/NTL -+# mkdir -p -m 755 $(DOCDIR) -+# rm -rf $(DOCDIR)/NTL -+# mkdir -m 755 $(DOCDIR)/NTL -+# cp -p ../doc/*.txt $(DOCDIR)/NTL -+# cp -p ../doc/*.html $(DOCDIR)/NTL -+# cp -p ../doc/*.gif $(DOCDIR)/NTL -+# - chmod -R a+r $(DOCDIR)/NTL -+# mkdir -p -m 755 $(LIBDIR) -+# cp -p ntl.a $(LIBDIR)/libntl.a #LSTAT -+# - chmod a+r $(LIBDIR)/libntl.a #LSTAT -+## $(LIBTOOL) --mode=install cp -p libntl.la $(LIBDIR) #LSHAR -+ $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(INCLUDEDIR)/NTL -+ $(BSD_INSTALL_DATA) ../include/NTL/*.h ${DESTDIR}$(INCLUDEDIR)/NTL -+ $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(DOCDIR)/NTL -+ $(BSD_INSTALL_DATA) ../doc/*.txt ${DESTDIR}$(DOCDIR)/NTL -+ $(BSD_INSTALL_DATA) ../doc/*.html ${DESTDIR}$(DOCDIR)/NTL -+ $(BSD_INSTALL_DATA) ../doc/*.gif ${DESTDIR}$(DOCDIR)/NTL -+ $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) libntl.la ${DESTDIR}$(LIBDIR) - - uninstall: - rm -f $(LIBDIR)/libntl.a #LSTAT -@@ -460,7 +472,7 @@ - ################################################################# - - clobber: -- rm -f ntl.a mach_desc.h ../include/NTL/mach_desc.h GetTime.c -+ rm -f 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 -f *.o -@@ -471,7 +483,7 @@ - - clean: - sh RemoveProg MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux -- rm -f *.o -+ rm -f *.o *.lo - rm -rf small - # - $(LIBTOOL) --mode=clean rm -f libntl.la *.lo #LSHAR - -@@ -521,22 +533,25 @@ - WOBJ = $(WO3) - - # wntl.a: LCOMP= #LSHAR --wntl.a: $(WOBJ) -- $(AR) $(ARFLAGS) wntl.a $(WOBJ) -- - $(RANLIB) wntl.a -+libwntl.la: $(WOBJ) -+# $(AR) $(ARFLAGS) wntl.a $(WOBJ) -+# - $(RANLIB) wntl.a -+ $(LIBTOOL) --mode=link $(CC) -o libwntl.la $(WOBJ:.o=.lo) \ -+ -rpath $(LIBDIR) \ -+ -version-info 0:0 - - MulTimeTest: -- $(LINK_CXX) -o MulTimeTest MulTimeTest.c wntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(LDLIBS_CXX) -+ $(LINK_CXX) -o MulTimeTest MulTimeTest.c libwntl.la $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(LDLIBS_CXX) - - PolyTimeTest: -- $(LINK_CXX) -o PolyTimeTest PolyTimeTest.c wntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(LDLIBS_CXX) -+ $(LINK_CXX) -o PolyTimeTest PolyTimeTest.c libwntl.la $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(LDLIBS_CXX) - - Poly1TimeTest: -- $(LINK_CXX) -o Poly1TimeTest Poly1TimeTest.c wntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(LDLIBS_CXX) -+ $(LINK_CXX) -o Poly1TimeTest Poly1TimeTest.c libwntl.la $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(LDLIBS_CXX) - - - GF2XTimeTest: -- $(LINK_CXX) -o GF2XTimeTest GF2XTimeTest.c wntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(LDLIBS_CXX) -+ $(LINK_CXX) -o GF2XTimeTest GF2XTimeTest.c libwntl.la $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(LDLIBS_CXX) - - InitSettings: - $(LINK_CXX) -o InitSettings InitSettings.c $(LDLIBS_CXX) diff --git a/math/ntl/patches/patch-ab b/math/ntl/patches/patch-ab deleted file mode 100644 index 00abc7082ad..00000000000 --- a/math/ntl/patches/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2012/01/02 23:42:28 dholland Exp $ - -Configure for pkgsrc. - ---- ../include/NTL/config.h.orig Mon Jan 29 06:50:11 2001 -+++ ../include/NTL/config.h -@@ -71,7 +71,7 @@ - #endif - - --#if 0 -+#if 1 - #define NTL_GMP_LIP - - /* diff --git a/math/ntl/patches/patch-ac b/math/ntl/patches/patch-ac deleted file mode 100644 index 261ceb7762a..00000000000 --- a/math/ntl/patches/patch-ac +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2012/01/02 23:42:28 dholland Exp $ - -- adjust to libtooling - ---- WizardAux.orig 2009-08-14 12:53:12.000000000 +0000 -+++ WizardAux -@@ -47,7 +47,7 @@ sub RunProg { - my $val; - my $res; - -- system("make wntl.a"); -+ system("make libwntl.la"); - RemoveProg($name); - system("make $name"); - diff --git a/math/ntl/patches/patch-mfile b/math/ntl/patches/patch-mfile new file mode 100644 index 00000000000..e675dd64548 --- /dev/null +++ b/math/ntl/patches/patch-mfile @@ -0,0 +1,15 @@ +$NetBSD: patch-mfile,v 1.1 2020/06/08 13:42:38 wiz Exp $ + +Add missing rpath. + +--- mfile.orig 2020-01-04 18:49:16.000000000 +0000 ++++ mfile +@@ -88,7 +88,7 @@ GMP_LIBDIR=@{GMP_LIBDIR} + # directory containing libgmp.a if using GMP + + GMP_OPT_INCDIR=@{GMPI}-I$(GMP_INCDIR) # GMPI +-GMP_OPT_LIBDIR=@{GMPL}-L$(GMP_LIBDIR) # GMPL ++GMP_OPT_LIBDIR=@{GMPL}$(COMPILER_RPATH_FLAG)$(GMP_LIBDIR) -L$(GMP_LIBDIR) # GMPL + GMP_OPT_LIB=@{GMP}-lgmp # GMP + # uncomment these if using GMP + |