commit ntl for openSUSE:Factory
Hello community, here is the log from the commit of package ntl for openSUSE:Factory checked in at 2015-02-20 12:01:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ntl (Old) and /work/SRC/openSUSE:Factory/.ntl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ntl" Changes: -------- --- /work/SRC/openSUSE:Factory/ntl/ntl.changes 2015-02-10 20:24:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ntl.new/ntl.changes 2015-02-20 12:01:36.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Feb 12 12:34:59 UTC 2015 - jengelh@inai.de + +- Update ntl-automake.diff: add a missing backslash causing not all + headers to be installed. Support mingw a bit better, too. + Support non-C++11 systems. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntl-automake.diff ++++++ --- /var/tmp/diff_new_pack.fsWGQl/_old 2015-02-20 12:01:37.000000000 +0100 +++ /var/tmp/diff_new_pack.fsWGQl/_new 2015-02-20 12:01:37.000000000 +0100 @@ -4,19 +4,19 @@ Date: 2015-02-03 01:46:19.087083498 +0100 (update for ntl 8) --- - Makefile.am | 13 +++++ + Makefile.am | 15 ++++++ autogen.sh | 5 ++ - configure.ac | 51 +++++++++++++++++++++++ - include/Makefile.am | 94 +++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 94 +++++++++++++++++++++++++++++++++++++++++ + include/Makefile.am | 94 +++++++++++++++++++++++++++++++++++++++++ include/NTL/g_lip.h | 1 - src/Makefile.am | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 6 files changed, 276 insertions(+), 1 deletion(-) + src/Makefile.am | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 6 files changed, 326 insertions(+), 1 deletion(-) Index: ntl-8.1.2/Makefile.am =================================================================== --- /dev/null +++ ntl-8.1.2/Makefile.am -@@ -0,0 +1,13 @@ +@@ -0,0 +1,15 @@ +# -*- Makefile -*- + +ACLOCAL_AMFLAGS = -I m4 @@ -24,11 +24,13 @@ +SUBDIRS = . include src + +BUILT_SOURCES = include/NTL/config.h ++CLEANFILES = include/NTL/config.h + +pkgincludedir = ${includedir}/NTL +pkginclude_HEADERS = include/NTL/config.h + +include/NTL/config.h: config.h ++ mkdir -p include/NTL + grep 'define NTL_' <$< >$@ Index: ntl-8.1.2/autogen.sh =================================================================== @@ -44,8 +46,9 @@ =================================================================== --- /dev/null +++ ntl-8.1.2/configure.ac -@@ -0,0 +1,51 @@ -+AC_INIT([ntl], [5.5.2]) +@@ -0,0 +1,94 @@ ++AC_INIT([ntl], [8.1.2]) ++AC_CONFIG_AUX_DIR([build-aux]) +AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_MACRO_DIR([m4]) +AC_PROG_INSTALL @@ -59,6 +62,7 @@ + + +AH_TEMPLATE([NTL_STD_CXX], [Use this flag if you want to use the Standard C++ version of NTL. In this version, all of NTL is wrapped inside the NTL namespace, and standard headers like cstdlib are used instead of stdlib.h.]) ++AH_TEMPLATE([NTL_THREADS], [Enable using C++11 threads]) +AH_TEMPLATE([NTL_PSTD_NNS], [Set if NTL library components are to be wrapped in namespace NTL.]) +AH_TEMPLATE([NTL_PSTD_NHF], [Set if you want to use the new header files cstdlib, etc.]) +AH_TEMPLATE([NTL_PSTD_NTN], [Set if you want to use the nothrow version of new.]) @@ -78,22 +82,63 @@ +AC_DEFINE([NTL_STD_CXX], [1]) +AC_DEFINE([NTL_PSTD_NHF], [1]) + -+with_gmp="auto"; -+AC_ARG_WITH([gmp], AS_HELP_STRING([--with-gmp], [Build against GMP])) -+echo "Utilizing GMP... $with_gmp"; ++shorthost="" ++case "$host" in ++ *-mingw*) ++ shorthost="mingw";; ++esac ++AM_CONDITIONAL([MINGW], [test "$shorthost" = mingw]) ++ ++AC_MSG_CHECKING([for C++11 support]) ++>conftest.c ++has_cxx11=no ++my_CXXFLAGS="" ++AS_IF([$CC -std=c++11 -c conftest.c >/dev/null 2>/dev/null], [ ++ AC_MSG_RESULT([yes]) ++ has_cxx11=yes ++ my_CXXFLAGS="$my_CXXFLAGS -std=c++11" ++], [ ++ AC_MSG_RESULT([no]) ++ has_cxx11=no ++]) ++ ++# threads ++AC_ARG_ENABLE([threads], ++ AS_HELP_STRING([--disable-threads], [[Do not use C++11 threads [automatic]]]), ++ [with_threads="$enableval"], ++ [with_threads=yes]) ++dnl mingw's thread implementation is not complete it seems. ++AS_IF([test "$shorthost" = mingw], [with_threads=no]) ++AS_IF([test "$has_cxx11" != yes], [with_threads=no]) ++AC_MSG_CHECKING([whether to build with C++11 threads]) ++AC_MSG_RESULT([$with_threads]) ++AS_IF([test "$with_threads" != no], [AC_DEFINE([NTL_THREADS], [1])]) ++ ++# gmp ++AC_ARG_WITH([gmp], AS_HELP_STRING([--with-gmp], [Build against GMP]), ++ [with_gmp="$withval"], ++ [ ++ AC_LANG_PUSH([C++]) ++ AC_CHECK_HEADERS([gmpxx.h], [with_gmp=yes], [with_gmp=no]) ++ AC_LANG_POP([C++]) ++ ]) ++AC_MSG_CHECKING([whether to build with GMP]) ++AC_MSG_RESULT([$with_gmp]) +AM_CONDITIONAL([WITH_GMP], [test "$with_gmp" != no]) -+if test "$with_gmp" != no; then -+ AC_DEFINE([NTL_GMP_LIP], [1]) -+fi; -+ -+with_gf2x="auto"; -+AC_ARG_WITH([gf2x], AS_HELP_STRING([--with-gf2x], [Build against GF2X])) -+echo "Utilizing gf2x... $with_gf2x"; ++AS_IF([test "$with_gmp" != no], [AC_DEFINE([NTL_GMP_LIP], [1])]) ++ ++# gf2x ++AC_ARG_WITH([gf2x], AS_HELP_STRING([--with-gf2x], [Build against GF2X]), ++ [with_gf2x="$withval"], ++ [ ++ AC_CHECK_HEADERS([gf2x.h], [with_gf2x=yes], [with_gf2x=no]) ++ ]) ++AC_MSG_CHECKING([whether to build with gf2x]) ++AC_MSG_RESULT([$with_gf2x]) +AM_CONDITIONAL([WITH_GF2X], [test "$with_gf2x" != no]) -+if test "$with_gf2x" != no; then -+ AC_DEFINE([NTL_GF2X_LIB], [1]) -+fi; ++AS_IF([test "$with_gf2x" != no], [AC_DEFINE([NTL_GF2X_LIB], [1])]) + ++AC_SUBST([my_CXXFLAGS]) +AC_CONFIG_FILES([Makefile src/Makefile include/Makefile]) +AC_OUTPUT Index: ntl-8.1.2/include/Makefile.am @@ -118,7 +163,7 @@ + NTL/LazyTable.h \ + NTL/LLL.h \ + NTL/RR.h \ -+ NTL/SmartPtr.h ++ NTL/SmartPtr.h \ + NTL/SPMM_ASM.h \ + NTL/WordVector.h \ + NTL/ZZ.h \ @@ -209,16 +254,16 @@ =================================================================== --- /dev/null +++ ntl-8.1.2/src/Makefile.am -@@ -0,0 +1,113 @@ +@@ -0,0 +1,118 @@ +# -*- Makefile -*- + -+AM_CPPFLAGS = -I${top_builddir}/include -I${top_srcdir}/include -DNTL_THREADS -+AM_CXXFLAGS = -std=gnu++11 ++AM_CPPFLAGS = -I${top_builddir}/include -I${top_srcdir}/include ++AM_CXXFLAGS = ${my_CXXFLAGS} + +lib_LTLIBRARIES = libntl.la + +# cf. "VERSION_INFO" file -+libntl_la_LDFLAGS = -version-info 9:1:0 ++libntl_la_LDFLAGS = -version-info 9:1:0 -no-undefined +libntl_la_LIBADD = -lm +if WITH_GMP +libntl_la_LIBADD += -lgmp @@ -228,7 +273,7 @@ +endif +libntl_la_SOURCES = \ + FFT.cpp FacVec.cpp GF2.cpp GF2E.cpp GF2EX.cpp GF2EXFactoring.cpp \ -+ GF2X.cpp GF2X1.cpp GF2XFactoring.cpp GF2XVec.cpp GetTime1.cpp HNF.cpp \ ++ GF2X.cpp GF2X1.cpp GF2XFactoring.cpp GF2XVec.cpp HNF.cpp \ + ctools.cpp LLL.cpp LLL_FP.cpp LLL_QP.cpp LLL_RR.cpp LLL_XD.cpp RR.cpp \ + WordVector.cpp ZZ.cpp ZZVec.cpp ZZX.cpp ZZX1.cpp ZZXCharPoly.cpp \ + ZZXFactoring.cpp ZZ_p.cpp ZZ_pE.cpp ZZ_pEX.cpp ZZ_pEXFactoring.cpp \ @@ -241,6 +286,11 @@ + vec_GF2.cpp vec_GF2E.cpp vec_RR.cpp vec_ZZ.cpp vec_ZZ_p.cpp \ + vec_ZZ_pE.cpp xdouble.cpp G_LLL_FP.cpp G_LLL_QP.cpp G_LLL_XD.cpp \ + G_LLL_RR.cpp vec_lzz_p.cpp vec_lzz_pE.cpp GetPID1.cpp thread.cpp ++if MINGW ++libntl_la_SOURCES += GetTime4.cpp ++else ++libntl_la_SOURCES += GetTime1.cpp ++endif + +BUILT_SOURCES = mach_desc.h gmp_aux.h + @@ -249,7 +299,7 @@ + +gen_gmp_aux.${OBJEXT}: mach_desc.h + -+gmp_aux.h: gen_gmp_aux ++gmp_aux.h: gen_gmp_aux${EXEEXT} + ./gen_gmp_aux${EXEEXT} >gmp_aux.h; + mkdir -p ../include/NTL; + cp gmp_aux.h ../include/NTL/; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de