summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraziano.giuliani2018-08-14 17:36:01 +0200
committergraziano.giuliani2018-08-14 17:36:01 +0200
commit49a0a707c21fefe75ee97033d0415a3a9c61eaf4 (patch)
tree607e6d31761be3f97e25223323c027d83d0d1f4d
parent4ce30db85150a4163ab92709c9d1e471702bdbc0 (diff)
downloadaur-49a0a707c21fefe75ee97033d0415a3a9c61eaf4.tar.gz
ODB is optional
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD5
2 files changed, 5 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 14f339cccb2..33678e8b254 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sun Jul 15 17:23:47 UTC 2018
+# Tue Aug 14 14:30:01 UTC 2018
pkgbase = magics++
pkgdesc = Magics is the latest generation of the ECMWF's Meteorological plotting software MAGICS.
pkgver = 3.1.0
- pkgrel = 1
+ pkgrel = 2
url = https://software.ecmwf.int/wiki/display/MAGP
arch = i686
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 953253a6fb1..1abe982e501 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=magics++
Pkgname=Magics
pkgver=3.1.0
_attnum=3473464
-pkgrel=1
+pkgrel=2
pkgdesc="Magics is the latest generation of the ECMWF's Meteorological plotting software MAGICS."
arch=('i686' 'x86_64')
url="https://software.ecmwf.int/wiki/display/MAGP"
@@ -23,12 +23,13 @@ build() {
patch -p0 -i ../patch
patch -p2 -i ../g++7.patch
rm -fr src/boost/range && ln -sf /usr/include/boost/range src/boost
+ [ -x /usr/bin/odb ] && has_odb=ON || has_odb=OFF
mkdir -p build
cd build
CC=gcc CXX='g++' \
cmake -DCMAKE_LINKER_FLAGS="-pthread" \
-DCMAKE_SHARED_LINKER_FLAGS="-pthread" \
- -DCMAKE_EXE_LINKER_FLAGS="-pthread" \
+ -DCMAKE_EXE_LINKER_FLAGS="-pthread" -DENABLE_ODB=${has_odb} \
-Dodb_api_DIR=/usr/share/odb_api/cmake \
-DCMAKE_CXX_COMPILER=g++ -DCMAKE_CC_COMPILER=gcc \
-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=production \