summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Zou2020-04-17 12:05:11 +0200
committerMichel Zou2020-04-17 12:05:11 +0200
commit7569be62ec4a226d88db9819461498c7a67f606d (patch)
treeff491720678eea509fa1d5e20fb428e883d54849
parent2e32bb811beb55e0341029e68c5a307d66aee6bb (diff)
downloadaur-7569be62ec4a226d88db9819461498c7a67f606d.tar.gz
fix conflicts
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD13
2 files changed, 6 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 77374bfd0d1f..9c0ecc562f35 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,7 +7,6 @@ pkgbase = feelpp
arch = x86_64
license = LGPL
makedepends = cmake
- makedepends = clang
depends = cln
depends = mumps
depends = slepc
diff --git a/PKGBUILD b/PKGBUILD
index 5de866f73351..3f3ce0d653a9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ arch=('i686' 'x86_64')
url="https://github.com/feelpp"
license=('LGPL')
depends=('cln' 'mumps' 'slepc' 'gmsh' 'fftw' 'ann' 'glpk' 'gsl' 'python')
-makedepends=('cmake' 'clang')
+makedepends=('cmake')
source=("${pkgname}-${pkgver}::git+https://github.com/feelpp/feelpp.git#tag=v${pkgver}")
sha256sums=('SKIP')
@@ -29,8 +29,6 @@ build() {
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_LIBDIR=lib \
- -DCMAKE_C_COMPILER=/usr/bin/clang \
- -DCMAKE_CXX_COMPILER=/usr/bin/clang++ \
-DPETSC_DIR=/opt/petsc/linux-c-opt/ \
-DSLEPC_DIR=/opt/slepc/linux-c-opt/ \
-DFEELPP_MINIMAL_CONFIGURATION=ON \
@@ -45,14 +43,15 @@ build() {
-DFEELPP_ENABLE_FFTW=ON \
-DFEELPP_ENABLE_GSL=ON \
..
- # templates take a lot of ram
- make -j1
+ make
}
package() {
cd ${pkgname}-${pkgver}/build
make DESTDIR="$pkgdir" install
- rm "$pkgdir"/usr/bin/ginsh
- rm "$pkgdir"/usr/lib/libz.a
+ rm "$pkgdir"/usr/bin/{ginsh,gflags_completions.sh}
+ rm "$pkgdir"/usr/lib/*.a
+ rm -r "$pkgdir"/usr/doc
+ rm -r "$pkgdir"/home
}