Date: Sunday, September 4, 2016 @ 08:03:40
Author: arojas
Revision: 188453
Drop old patches
Deleted:
linbox/trunk/lapack.patch
linbox/trunk/linbox-fplll.patch
linbox/trunk/underlink.patch
--------------------+
lapack.patch | 22 ------------
linbox-fplll.patch | 87 ---------------------------------------------------
underlink.patch | 41 ------------------------
3 files changed, 150 deletions(-)
Deleted: lapack.patch
===================================================================
--- lapack.patch 2016-09-04 07:26:31 UTC (rev 188452)
+++ lapack.patch 2016-09-04 08:03:40 UTC (rev 188453)
@@ -1,22 +0,0 @@
---- ./macros/lapack-check.m4.orig 2012-06-07 02:30:26.000000000 -0600
-+++ ./macros/lapack-check.m4 2012-10-02 15:05:47.051001770 -0600
-@@ -38,7 +38,7 @@ LIBS="${BACKUP_LIBS} ${BLAS_LIBS}"
-
- AC_TRY_RUN(dnl ICC ?
- [ #include "fflas-ffpack/fflas-ffpack-config.h"
-- #ifdef __FFLAS_FFPACK_HAVE_LAPACK
-+ #ifdef __FFLASFFPACK_HAVE_LAPACK
- int main() { return 0 ; }
- #else
- a pas lapack
---- ./configure.orig 2012-06-07 15:19:31.000000000 -0600
-+++ ./configure 2012-10-02 15:06:07.629005714 -0600
-@@ -18077,7 +18077,7 @@ else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #include "fflas-ffpack/fflas-ffpack-config.h"
-- #ifdef __FFLAS_FFPACK_HAVE_LAPACK
-+ #ifdef __FFLASFFPACK_HAVE_LAPACK
- int main() { return 0 ; }
- #else
- a pas lapack
Deleted: linbox-fplll.patch
===================================================================
--- linbox-fplll.patch 2016-09-04 07:26:31 UTC (rev 188452)
+++ linbox-fplll.patch 2016-09-04 08:03:40 UTC (rev 188453)
@@ -1,87 +0,0 @@
---- ./linbox/algorithms/lattice.h.orig 2012-06-07 02:30:32.000000000 -0600
-+++ ./linbox/algorithms/lattice.h 2012-12-10 16:03:03.114827079 -0700
-@@ -48,18 +48,7 @@
-
-
- #ifdef __LINBOX_HAVE_FPLLL
--// this is a damn FPLLL bug !!!
--namespace FPLLL {
--#define round
--#define trunc
- #include <fplll/fplll.h>
--#include <fplll/heuristic.h>
--#include <fplll/proved.h>
--#include <fplll/wrapper.h>
--#undef round
--#undef trunc
--}
--
- #endif
-
-
---- ./linbox/algorithms/lattice.inl.orig 2012-06-07 02:30:32.000000000
-0600
-+++ ./linbox/algorithms/lattice.inl 2012-12-10 16:05:04.846262737 -0700
-@@ -335,31 +335,31 @@ namespace LinBox
- if (withU)
- throw NotImplementedYet("not U");
- // Convert H
-- FPLLL::ZZ_mat<ZT> B(H.rowdim(),H.coldim()) ;
-+ fplll::ZZ_mat<ZT> B(H.rowdim(),H.coldim()) ;
- for (size_t i = 0 ; i < H.rowdim() ; ++i) {
- for (size_t j = 0 ; j < H.coldim() ; ++j) {
-- B.Set(i,j,FPLLL::Z_NR<ZT>(H.getEntry(i,j)) );
-+ B.Set(i,j,fplll::Z_NR<ZT>(H.getEntry(i,j)) );
- }
- }
- // LLL()
- switch (meth.getMeth()) {
- case (latticeMethod::latticeFPLLL::P) :
- {
-- FPLLL::proved<ZT,double>
lllMethod(&B,meth.getPrecision(),
-+ fplll::proved<ZT,double>
lllMethod(&B,meth.getPrecision(),
-
meth.getEta(),meth.getDelta());
- lllMethod.LLL();
- }
- break;
- case (latticeMethod::latticeFPLLL::W) :
- {
-- FPLLL::wrapper lllMethod(&B,meth.getPrecision(),
-+ fplll::wrapper lllMethod(&B,meth.getPrecision(),
-
meth.getEta(),meth.getDelta());
- lllMethod.LLL();
- }
- break;
- case (latticeMethod::latticeFPLLL::H) :
- {
-- FPLLL::heuristic<ZT,double>
lllMethod(&B,meth.getPrecision(),
-+ fplll::heuristic<ZT,double>
lllMethod(&B,meth.getPrecision(),
-
meth.getEta(),meth.getDelta(),
-
meth.getSiegel());
- lllMethod.LLL();
---- ./linbox/algorithms/rational-reconstruction.h.orig 2012-06-07
02:30:32.000000000 -0600
-+++ ./linbox/algorithms/rational-reconstruction.h 2012-12-10
16:05:42.491217743 -0700
-@@ -1734,7 +1734,7 @@ namespace LinBox
- for (size_t i=1;i< k+1;++i){
- Lattice.setEntry(i,i, mod );
- _r.convert(tmp,
real_approximation[bad_num_index+i-1]);
--
Lattice.setEntry(0,i,FPLLL::Z_NR<mpz_t>(tmp.get_mpz()));
-+
Lattice.setEntry(0,i,fplll::Z_NR<mpz_t>(tmp.get_mpz()));
- }
-
-
---- ./configure.orig 2012-12-10 16:02:55.325073492 -0700
-+++ ./configure 2012-12-10 16:03:03.118827059 -0700
-@@ -17018,12 +17018,11 @@ fi
- /* end confdefs.h. */
-
- #include <fplll/fplll.h>
-- #include <fplll/solver.h>
-
- int
- main ()
- {
--enum EvaluatorType a ;
-+enum fplll::MatPrintMode a ;
- ;
- return 0;
- }
Deleted: underlink.patch
===================================================================
--- underlink.patch 2016-09-04 07:26:31 UTC (rev 188452)
+++ underlink.patch 2016-09-04 08:03:40 UTC (rev 188453)
@@ -1,41 +0,0 @@
---- ./linbox/Makefile.in.orig 2012-06-07 15:19:27.000000000 -0600
-+++ ./linbox/Makefile.in 2012-09-26 11:26:58.091786035 -0600
-@@ -154,7 +154,7 @@ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM
- CXXLD = $(CXX)
- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-- $(LDFLAGS) -o $@
-+ $(liblinbox_la_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(liblinbox_la_SOURCES)
- DIST_SOURCES = $(liblinbox_la_SOURCES)
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -390,6 +390,7 @@ liblinbox_la_LIBADD = \
- util/libutil.la \
- randiter/libranditer.la \
- algorithms/libalgorithms.la
-+liblinbox_la_LDFLAGS = $(MPFR_LIBS) $(IML_LIBS) $(BLAS_LIBS)
-
- all: all-recursive
-
---- ./interfaces/sage/Makefile.in.orig 2012-06-07 15:19:27.000000000 -0600
-+++ ./interfaces/sage/Makefile.in 2012-09-26 11:37:52.303447240 -0600
-@@ -334,7 +334,7 @@ top_srcdir = @top_srcdir@
- #liblinboxsage_la_LIBADD = -llinbox $(BLAS_LIBS)
- #gentoo's linbox-1.1.6-fix-undefined-symbols.patch
- @LINBOX_HAVE_SAGE_TRUE@liblinboxsage_la_LIBADD =
$(top_builddir)/linbox/liblinbox.la
--@LINBOX_HAVE_SAGE_TRUE@liblinboxsage_la_LDFLAGS = $(GIVARO_LIBS) $(GMP_LIBS)
$(NTL_LIBS) $(BLAS_LIBS) $(MAPLE_LIBS) $(LDFLAGS) -version-info 0:0:0
#-Wl,-zmuldefs
-+@LINBOX_HAVE_SAGE_TRUE@liblinboxsage_la_LDFLAGS = -Wl,--as-needed
-L$(libdir)/atlas ../../linbox/liblinbox.la $(GIVARO_LIBS) $(NTL_LIBS)
$(BLAS_LIBS) $(MAPLE_LIBS) $(LDFLAGS) -version-info 0:0:0 #-Wl,-zmuldefs
- all: all-am
-
- .SUFFIXES:
---- ./interfaces/driver/Makefile.in.orig 2012-06-07 15:19:27.000000000
-0600
-+++ ./interfaces/driver/Makefile.in 2012-09-26 11:35:50.467638808 -0600
-@@ -370,7 +370,7 @@ top_srcdir = @top_srcdir@
-
- # \
- # # lb-solve.C
--@LINBOX_COMPILE_DRIVERS_TRUE@liblbdriver_la_LDFLAGS = $(GIVARO_LIBS)
$(GMP_LIBS) $(NTL_LIBS) $(BLAS_LIBS) $(LDFLAGS)
$(top_srcdir)/linbox/liblinbox.la -Wl,-zmuldefs
-+@LINBOX_COMPILE_DRIVERS_TRUE@liblbdriver_la_LDFLAGS = -Wl,--as-needed
-L$(libdir)/atlas $(GIVARO_LIBS) $(NTL_LIBS) $(BLAS_LIBS) $(LDFLAGS)
$(top_srcdir)/linbox/liblinbox.la -Wl,-zmuldefs
- @LINBOX_COMPILE_DRIVERS_TRUE@pkginclude_HEADERS = \
- @LINBOX_COMPILE_DRIVERS_TRUE@ lb-driver.h \
- @LINBOX_COMPILE_DRIVERS_TRUE@ lb-blackbox-abstract.h \
