diff options
| -rw-r--r-- | .SRCINFO | 21 | ||||
| -rw-r--r-- | PKGBUILD | 29 | ||||
| -rw-r--r-- | d6891c9.patch | 26 | ||||
| -rw-r--r-- | fix-compilation.patch | 40 |
4 files changed, 24 insertions, 92 deletions
@@ -1,26 +1,27 @@ # Generated by mksrcinfo v8 -# Sat Dec 30 13:37:52 UTC 2017 +# Sat May 5 10:44:36 UTC 2018 pkgbase = feelpp - pkgver = 0.103.2 + pkgver = 0.104.0 pkgrel = 1 url = https://github.com/feelpp arch = i686 arch = x86_64 license = LGPL makedepends = cmake - makedepends = eigen3 + makedepends = python2 depends = cln depends = mumps depends = slepc - depends = petsc depends = gmsh depends = fftw - source = https://github.com/feelpp/feelpp/releases/download/v0.103.2/feelpp-0.103.2.tar.gz - source = fix-compilation.patch - source = d6891c9.patch - sha256sums = e083b6107cd78eafede8b051e478093b52a52c961748721241c874cfad2b9fe9 - sha256sums = SKIP - sha256sums = SKIP + depends = ann + depends = libbson + depends = glpk + depends = gsl + depends = python + depends = ginac + source = https://github.com/feelpp/feelpp/releases/download/v0.104.0/feelpp-0.104.0.tar.gz + sha256sums = 380ff2712c01740460ecef4326fa790f5daee8bc79a8d3359d1a61099e32d533 pkgname = feelpp @@ -2,27 +2,23 @@ # Contributor: George Eleftheriou <eleftg> pkgname='feelpp' -pkgver=0.103.2 +pkgver=0.104.0 pkgrel=1 arch=('i686' 'x86_64') url="https://github.com/feelpp" license=('LGPL') -depends=('cln' 'mumps' 'slepc' 'petsc' 'gmsh' 'fftw') -makedepends=('cmake' 'eigen3') -source=("https://github.com/feelpp/feelpp/releases/download/v${pkgver}/feelpp-${pkgver}.tar.gz" fix-compilation.patch d6891c9.patch) -sha256sums=('e083b6107cd78eafede8b051e478093b52a52c961748721241c874cfad2b9fe9' SKIP SKIP) +depends=('cln' 'mumps' 'slepc' 'gmsh' 'fftw' 'ann' 'libbson' 'glpk' 'gsl' 'python' 'ginac') +makedepends=('cmake' 'python2') +source=("https://github.com/feelpp/feelpp/releases/download/v${pkgver}/feelpp-${pkgver}.tar.gz") +sha256sums=('380ff2712c01740460ecef4326fa790f5daee8bc79a8d3359d1a61099e32d533') prepare() { cd $pkgbase-$pkgver - grep -lr 'COMMAND python' contrib/ginac|xargs sed -i "s|COMMAND python |COMMAND python2 |g" - - patch -p1 -i "$srcdir"/fix-compilation.patch - patch -p1 -i "$srcdir"/d6891c9.patch + # https://github.com/feelpp/feelpp/issues/1096 + grep -lr 'COMMAND python' contrib/ginac|xargs sed -i "s|COMMAND python |COMMAND python2 |g" } - - build() { cd $pkgbase-$pkgver mkdir -p build && cd build @@ -32,9 +28,7 @@ build() { -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_C_COMPILER=/usr/bin/clang \ -DCMAKE_CXX_COMPILER=/usr/bin/clang++ \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 \ -DPETSC_DIR=/opt/petsc/linux-c-opt/ \ - -DFEELPP_ENABLE_SYSTEM_EIGEN3=OFF \ -DFEELPP_ENABLE_OPENTURNS=OFF \ -DFEELPP_ENABLE_VTK=OFF \ -DFEELPP_ENABLE_QUICKSTART=OFF \ @@ -44,10 +38,9 @@ build() { -DFEELPP_ENABLE_APPLICATIONS=OFF \ -DFEELPP_ENABLE_TESTS=OFF \ -DFEELPP_ENABLE_RESEARCH=OFF \ - -DFEELPP_ENABLE_GMSH=OFF \ - -DBUILD_GUILE=OFF -DBUILD_MATLAB=OFF -DUSE_SWIG=OFF \ - -DSUPPORT_OMP=OFF -DEIGEN_TEST_OPENMP=OFF \ + -DBUILD_GUILE=OFF -DBUILD_PYTHON=OFF \ .. + # templates take a lot of ram make feelpp -j1 make } @@ -55,5 +48,9 @@ build() { package() { cd $pkgbase-$pkgver/build make DESTDIR="$pkgdir/" install + rm -r "$pkgdir"/usr/include/boost + rm "$pkgdir/"usr/lib/pkgconfig/hana.pc + rm "$pkgdir"/usr/bin/ginsh + rm -r "$pkgdir"/home } diff --git a/d6891c9.patch b/d6891c9.patch deleted file mode 100644 index 00a8e3da2ced..000000000000 --- a/d6891c9.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d6891c90f49d809cc3150d1b6e36c9d74df8f664 Mon Sep 17 00:00:00 2001 -From: Christophe Prud'homme <christophe.prudhomme@feelpp.org> -Date: Fri, 6 Oct 2017 08:28:49 +0200 -Subject: [PATCH] petsc 3.8 seems to work fine with feel++ fixes #1068 - ---- - feel/feelalg/preconditionerpetsc.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/feel/feelalg/preconditionerpetsc.cpp b/feel/feelalg/preconditionerpetsc.cpp -index f9d5287b7f..0ad7bf4f36 100644 ---- a/feel/feelalg/preconditionerpetsc.cpp -+++ b/feel/feelalg/preconditionerpetsc.cpp -@@ -2954,8 +2954,12 @@ ConfigurePCGAMG::run( PC& pc ) - this->check( PCGAMGSetProcEqLim( pc, M_procEqLim ) ); - // Set max number of equations on coarse grids - this->check( PCGAMGSetCoarseEqLim( pc, M_coarseEqLim ) ); -+#if PETSC_VERSION_GREATER_OR_EQUAL_THAN( 3,8,0 ) -+ this->check( PCGAMGSetThresholdScale( pc, M_threshold ) ); -+#else - // Relative threshold to use for dropping edges in aggregation graph - this->check( PCGAMGSetThreshold( pc, M_threshold ) ); -+#endif - // not works!!(seems to be missing PetscObjectComposeFunction with this function) - //this->check( PCGAMGSetSymGraph( pc, ( M_setSymGraph )?PETSC_TRUE : PETSC_FALSE ) ); - // Reuse prolongation operator diff --git a/fix-compilation.patch b/fix-compilation.patch deleted file mode 100644 index 24e4c46e1de6..000000000000 --- a/fix-compilation.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b89da3af89255f6da77780d4679fd693489528c2 Mon Sep 17 00:00:00 2001 -From: Vincent Chabannes <vincent.chabannes@feelpp.org> -Date: Sat, 22 Jul 2017 10:05:47 +0200 -Subject: [PATCH] fix compilation - ---- - feel/feeldiscr/detail/element_impl.hpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/feel/feeldiscr/detail/element_impl.hpp b/feel/feeldiscr/detail/element_impl.hpp -index 8e13ae543b..9266694f42 100644 ---- a/feel/feeldiscr/detail/element_impl.hpp -+++ b/feel/feeldiscr/detail/element_impl.hpp -@@ -370,7 +370,7 @@ FunctionSpace<A0, A1, A2, A3, A4>::Element<Y,Cont>::initSubElementView( mpl::tru - - template<typename A0, typename A1, typename A2, typename A3, typename A4> - template<typename Y, typename Cont> --FunctionSpace<A0, A1, A2, A3, A4>::Element<Y,Cont>& -+typename FunctionSpace<A0, A1, A2, A3, A4>::template Element<Y,Cont>& - FunctionSpace<A0, A1, A2, A3, A4>::Element<Y,Cont>::operator=( Element<Y,Cont> const& __e ) - { - if ( this != &__e ) -@@ -395,7 +395,7 @@ FunctionSpace<A0, A1, A2, A3, A4>::Element<Y,Cont>::operator=( Element<Y,Cont> c - template<typename A0, typename A1, typename A2, typename A3, typename A4> - template<typename Y, typename Cont> - template<typename ContOtherType> --FunctionSpace<A0, A1, A2, A3, A4>::Element<Y,Cont>& -+typename FunctionSpace<A0, A1, A2, A3, A4>::template Element<Y,Cont>& - FunctionSpace<A0, A1, A2, A3, A4>::Element<Y,Cont>::operator=( Element<Y,ContOtherType> const& v ) - { - if ( !M_functionspace ) -@@ -412,7 +412,7 @@ FunctionSpace<A0, A1, A2, A3, A4>::Element<Y,Cont>::operator=( Element<Y,ContOth - template<typename A0, typename A1, typename A2, typename A3, typename A4> - template<typename Y, typename Cont> - template<typename VectorExpr> --FunctionSpace<A0, A1, A2, A3, A4>::Element<Y,Cont>& -+typename FunctionSpace<A0, A1, A2, A3, A4>::template Element<Y,Cont>& - FunctionSpace<A0, A1, A2, A3, A4>::Element<Y,Cont>::operator=( VectorExpr const& __v ) - { - super::operator=( __v ); |