Date: Monday, May 16, 2016 @ 08:59:07 Author: arojas Revision: 175467
archrelease: copy trunk to community-testing-i686, community-testing-x86_64 Added: linbox/repos/community-testing-i686/PKGBUILD (from rev 175466, linbox/trunk/PKGBUILD) linbox/repos/community-testing-i686/lapack.patch (from rev 175466, linbox/trunk/lapack.patch) linbox/repos/community-testing-i686/linbox-fplll.patch (from rev 175466, linbox/trunk/linbox-fplll.patch) linbox/repos/community-testing-i686/underlink.patch (from rev 175466, linbox/trunk/underlink.patch) linbox/repos/community-testing-x86_64/PKGBUILD (from rev 175466, linbox/trunk/PKGBUILD) linbox/repos/community-testing-x86_64/lapack.patch (from rev 175466, linbox/trunk/lapack.patch) linbox/repos/community-testing-x86_64/linbox-fplll.patch (from rev 175466, linbox/trunk/linbox-fplll.patch) linbox/repos/community-testing-x86_64/underlink.patch (from rev 175466, linbox/trunk/underlink.patch) Deleted: linbox/repos/community-testing-i686/PKGBUILD linbox/repos/community-testing-i686/lapack.patch linbox/repos/community-testing-i686/linbox-fplll.patch linbox/repos/community-testing-i686/underlink.patch linbox/repos/community-testing-x86_64/PKGBUILD linbox/repos/community-testing-x86_64/lapack.patch linbox/repos/community-testing-x86_64/linbox-fplll.patch linbox/repos/community-testing-x86_64/underlink.patch ---------------------------------------------+ /PKGBUILD | 62 +++++++++ /lapack.patch | 44 ++++++ /linbox-fplll.patch | 174 ++++++++++++++++++++++++++ /underlink.patch | 82 ++++++++++++ community-testing-i686/PKGBUILD | 31 ---- community-testing-i686/lapack.patch | 22 --- community-testing-i686/linbox-fplll.patch | 87 ------------- community-testing-i686/underlink.patch | 41 ------ community-testing-x86_64/PKGBUILD | 31 ---- community-testing-x86_64/lapack.patch | 22 --- community-testing-x86_64/linbox-fplll.patch | 87 ------------- community-testing-x86_64/underlink.patch | 41 ------ 12 files changed, 362 insertions(+), 362 deletions(-) Deleted: community-testing-i686/PKGBUILD =================================================================== --- community-testing-i686/PKGBUILD 2016-05-16 06:58:30 UTC (rev 175466) +++ community-testing-i686/PKGBUILD 2016-05-16 06:59:07 UTC (rev 175467) @@ -1,31 +0,0 @@ -# $Id$ -# Maintainer: Antonio Rojas < nqn7...@gmail.com > - -pkgname=linbox -pkgver=1.4.1 -pkgrel=1 -pkgdesc="A template library for exact, high-performance linear algebra computation with dense, sparse, and structured matrices over the integers and over finite fields" -arch=(i686 x86_64) -url="http://linalg.org/" -license=(LGPL) -depends=(m4rie lapack flint libfplll iml givaro) -makedepends=(fflas-ffpack) -source=("https://github.com/linbox-team/linbox/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz") -md5sums=('e6638413bef578990d8764faca44ab17') - -build() { - cd $pkgname-$pkgver - - ./configure --prefix=/usr --enable-sage --enable-optimization --with-fplll=/usr - make -} - -check() { - cd $pkgname-$pkgver -# make check -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} Copied: linbox/repos/community-testing-i686/PKGBUILD (from rev 175466, linbox/trunk/PKGBUILD) =================================================================== --- community-testing-i686/PKGBUILD (rev 0) +++ community-testing-i686/PKGBUILD 2016-05-16 06:59:07 UTC (rev 175467) @@ -0,0 +1,31 @@ +# $Id$ +# Maintainer: Antonio Rojas < nqn7...@gmail.com > + +pkgname=linbox +pkgver=1.4.1 +pkgrel=2 +pkgdesc="A template library for exact, high-performance linear algebra computation with dense, sparse, and structured matrices over the integers and over finite fields" +arch=(i686 x86_64) +url="http://linalg.org/" +license=(LGPL) +depends=(m4rie lapack flint libfplll iml givaro) +makedepends=(fflas-ffpack) +source=("https://github.com/linbox-team/linbox/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz") +md5sums=('e6638413bef578990d8764faca44ab17') + +build() { + cd $pkgname-$pkgver + + ./configure --prefix=/usr --enable-sage --enable-optimization --with-fplll=/usr + make +} + +check() { + cd $pkgname-$pkgver +# make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} Deleted: community-testing-i686/lapack.patch =================================================================== --- community-testing-i686/lapack.patch 2016-05-16 06:58:30 UTC (rev 175466) +++ community-testing-i686/lapack.patch 2016-05-16 06:59:07 UTC (rev 175467) @@ -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 Copied: linbox/repos/community-testing-i686/lapack.patch (from rev 175466, linbox/trunk/lapack.patch) =================================================================== --- community-testing-i686/lapack.patch (rev 0) +++ community-testing-i686/lapack.patch 2016-05-16 06:59:07 UTC (rev 175467) @@ -0,0 +1,22 @@ +--- ./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: community-testing-i686/linbox-fplll.patch =================================================================== --- community-testing-i686/linbox-fplll.patch 2016-05-16 06:58:30 UTC (rev 175466) +++ community-testing-i686/linbox-fplll.patch 2016-05-16 06:59:07 UTC (rev 175467) @@ -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; - } Copied: linbox/repos/community-testing-i686/linbox-fplll.patch (from rev 175466, linbox/trunk/linbox-fplll.patch) =================================================================== --- community-testing-i686/linbox-fplll.patch (rev 0) +++ community-testing-i686/linbox-fplll.patch 2016-05-16 06:59:07 UTC (rev 175467) @@ -0,0 +1,87 @@ +--- ./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: community-testing-i686/underlink.patch =================================================================== --- community-testing-i686/underlink.patch 2016-05-16 06:58:30 UTC (rev 175466) +++ community-testing-i686/underlink.patch 2016-05-16 06:59:07 UTC (rev 175467) @@ -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 \ Copied: linbox/repos/community-testing-i686/underlink.patch (from rev 175466, linbox/trunk/underlink.patch) =================================================================== --- community-testing-i686/underlink.patch (rev 0) +++ community-testing-i686/underlink.patch 2016-05-16 06:59:07 UTC (rev 175467) @@ -0,0 +1,41 @@ +--- ./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 \ Deleted: community-testing-x86_64/PKGBUILD =================================================================== --- community-testing-x86_64/PKGBUILD 2016-05-16 06:58:30 UTC (rev 175466) +++ community-testing-x86_64/PKGBUILD 2016-05-16 06:59:07 UTC (rev 175467) @@ -1,31 +0,0 @@ -# $Id$ -# Maintainer: Antonio Rojas < nqn7...@gmail.com > - -pkgname=linbox -pkgver=1.4.1 -pkgrel=1 -pkgdesc="A template library for exact, high-performance linear algebra computation with dense, sparse, and structured matrices over the integers and over finite fields" -arch=(i686 x86_64) -url="http://linalg.org/" -license=(LGPL) -depends=(m4rie lapack flint libfplll iml givaro) -makedepends=(fflas-ffpack) -source=("https://github.com/linbox-team/linbox/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz") -md5sums=('e6638413bef578990d8764faca44ab17') - -build() { - cd $pkgname-$pkgver - - ./configure --prefix=/usr --enable-sage --enable-optimization --with-fplll=/usr - make -} - -check() { - cd $pkgname-$pkgver -# make check -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} Copied: linbox/repos/community-testing-x86_64/PKGBUILD (from rev 175466, linbox/trunk/PKGBUILD) =================================================================== --- community-testing-x86_64/PKGBUILD (rev 0) +++ community-testing-x86_64/PKGBUILD 2016-05-16 06:59:07 UTC (rev 175467) @@ -0,0 +1,31 @@ +# $Id$ +# Maintainer: Antonio Rojas < nqn7...@gmail.com > + +pkgname=linbox +pkgver=1.4.1 +pkgrel=2 +pkgdesc="A template library for exact, high-performance linear algebra computation with dense, sparse, and structured matrices over the integers and over finite fields" +arch=(i686 x86_64) +url="http://linalg.org/" +license=(LGPL) +depends=(m4rie lapack flint libfplll iml givaro) +makedepends=(fflas-ffpack) +source=("https://github.com/linbox-team/linbox/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz") +md5sums=('e6638413bef578990d8764faca44ab17') + +build() { + cd $pkgname-$pkgver + + ./configure --prefix=/usr --enable-sage --enable-optimization --with-fplll=/usr + make +} + +check() { + cd $pkgname-$pkgver +# make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} Deleted: community-testing-x86_64/lapack.patch =================================================================== --- community-testing-x86_64/lapack.patch 2016-05-16 06:58:30 UTC (rev 175466) +++ community-testing-x86_64/lapack.patch 2016-05-16 06:59:07 UTC (rev 175467) @@ -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 Copied: linbox/repos/community-testing-x86_64/lapack.patch (from rev 175466, linbox/trunk/lapack.patch) =================================================================== --- community-testing-x86_64/lapack.patch (rev 0) +++ community-testing-x86_64/lapack.patch 2016-05-16 06:59:07 UTC (rev 175467) @@ -0,0 +1,22 @@ +--- ./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: community-testing-x86_64/linbox-fplll.patch =================================================================== --- community-testing-x86_64/linbox-fplll.patch 2016-05-16 06:58:30 UTC (rev 175466) +++ community-testing-x86_64/linbox-fplll.patch 2016-05-16 06:59:07 UTC (rev 175467) @@ -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; - } Copied: linbox/repos/community-testing-x86_64/linbox-fplll.patch (from rev 175466, linbox/trunk/linbox-fplll.patch) =================================================================== --- community-testing-x86_64/linbox-fplll.patch (rev 0) +++ community-testing-x86_64/linbox-fplll.patch 2016-05-16 06:59:07 UTC (rev 175467) @@ -0,0 +1,87 @@ +--- ./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: community-testing-x86_64/underlink.patch =================================================================== --- community-testing-x86_64/underlink.patch 2016-05-16 06:58:30 UTC (rev 175466) +++ community-testing-x86_64/underlink.patch 2016-05-16 06:59:07 UTC (rev 175467) @@ -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 \ Copied: linbox/repos/community-testing-x86_64/underlink.patch (from rev 175466, linbox/trunk/underlink.patch) =================================================================== --- community-testing-x86_64/underlink.patch (rev 0) +++ community-testing-x86_64/underlink.patch 2016-05-16 06:59:07 UTC (rev 175467) @@ -0,0 +1,41 @@ +--- ./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 \