summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoreolianoe2016-11-18 11:02:45 +0100
committereolianoe2016-11-18 11:02:45 +0100
commit93103b9bbcdadf21b774eb04f25d203413be1aa0 (patch)
tree5615cee23928eff2fe6ebb4890b9fd7717a84097
parent897dfd082546e96cd78b311c7ab912b16805e6e4 (diff)
downloadaur-93103b9bbcdadf21b774eb04f25d203413be1aa0.tar.gz
enable xdmf and openssl
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD10
-rw-r--r--xdmf_stdc++.patch11
3 files changed, 24 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d762787cc01..1d734ee51bf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Mon Nov 14 12:56:53 UTC 2016
+# Fri Nov 18 10:02:35 UTC 2016
pkgbase = visit-build
pkgdesc = Interactive parallel visualization and graphical analysis tool (built with build_visit).
pkgver = 2.12.0
- pkgrel = 1
+ pkgrel = 2
url = https://wci.llnl.gov/simulation/computer-codes/visit
arch = i686
arch = x86_64
@@ -31,6 +31,7 @@ pkgbase = visit-build
source = no_install_qt5.patch
source = no_extract_visit.patch
source = vtk_gcc6.patch
+ source = xdmf_stdc++.patch
source = qt5-qpa.patch
sha256sums = 8338f8512abe559e6cece231160b873a221c0d24c0fcc6a0a962cc6071cd6515
sha256sums = 5b4e1b9d5a0e7edaa64c53bab300c9c1e3a1a13494180156a4f25a9c6d078dd4
@@ -38,6 +39,7 @@ pkgbase = visit-build
sha256sums = 8ec6767c3943c3b93c9817ef0d051799c5ebfac75e73e58175befd08bfd320e0
sha256sums = 6dfdf3fdf6e64437106fc4f9facc79e80ab204de12bb480c6209c6b3fc5b4e07
sha256sums = 77b1f762b05c660c2cb5f2b071533768fb6f905a2b7b14f4b4db29e0ada380bc
+ sha256sums = a4633d62cb927d2860d2814fd1f8f965fdedd1479aeba8ae32810f1ff96e0068
sha256sums = a523dd42c61ccd6743f23d35e63518c4dd33a465fa024e4431f002932464f26b
pkgname = visit-build
diff --git a/PKGBUILD b/PKGBUILD
index 6bc3c744d1c..bd9b99248d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=visit-build
_pkgname=visit
pkgver=2.12.0
_pkgver=${pkgver//./_}
-pkgrel=1
+pkgrel=2
pkgdesc="Interactive parallel visualization and graphical analysis tool (built with build_visit)."
arch=('i686' 'x86_64')
url="https://wci.llnl.gov/simulation/computer-codes/visit"
@@ -20,6 +20,7 @@ source=("https://portal.nersc.gov/svn/${_pkgname}/trunk/releases/${pkgver}/build
'no_install_qt5.patch'
'no_extract_visit.patch'
"vtk_gcc6.patch"
+ "xdmf_stdc++.patch"
'qt5-qpa.patch')
sha256sums=('8338f8512abe559e6cece231160b873a221c0d24c0fcc6a0a962cc6071cd6515'
'5b4e1b9d5a0e7edaa64c53bab300c9c1e3a1a13494180156a4f25a9c6d078dd4'
@@ -27,6 +28,7 @@ sha256sums=('8338f8512abe559e6cece231160b873a221c0d24c0fcc6a0a962cc6071cd6515'
'8ec6767c3943c3b93c9817ef0d051799c5ebfac75e73e58175befd08bfd320e0'
'6dfdf3fdf6e64437106fc4f9facc79e80ab204de12bb480c6209c6b3fc5b4e07'
'77b1f762b05c660c2cb5f2b071533768fb6f905a2b7b14f4b4db29e0ada380bc'
+ 'a4633d62cb927d2860d2814fd1f8f965fdedd1479aeba8ae32810f1ff96e0068'
'a523dd42c61ccd6743f23d35e63518c4dd33a465fa024e4431f002932464f26b')
options=(!emptydirs)
@@ -56,6 +58,9 @@ prepare(){
# Patch build_visit to apply patch that permits to build vtk with gcc6
patch "${srcdir}/build_${_pkgname}${_pkgver}" vtk_gcc6.patch
+ # Change standard to build xdmf
+ patch "${srcdir}/build_${_pkgname}${_pkgver}" xdmf_stdc++.patch
+
# Fix to use python2 in every scripts
sed -i 's/exec\ python/exec\ python2/' \
"${srcdir}/${_pkgname}${pkgver}/src/bin/frontendlauncher"
@@ -123,10 +128,13 @@ _build_command(){
--build-mode Release \
--hdf4 \
--hdf5 \
+ --icet \
--java \
--netcdf \
+ --openssl \
--silo \
--szip \
+ --xdmf \
--zlib \
${opt}
}
diff --git a/xdmf_stdc++.patch b/xdmf_stdc++.patch
new file mode 100644
index 00000000000..5b99f9afa41
--- /dev/null
+++ b/xdmf_stdc++.patch
@@ -0,0 +1,11 @@
+--- build_visit2_12_0 2016-11-14 11:29:58.588491632 +0100
++++ build_visit2_12_0.new 2016-11-16 18:07:16.462929363 +0100
+@@ -20565,7 +20565,7 @@
+ -DCMAKE_BUILD_TYPE:STRING="${VISIT_BUILD_MODE}" \
+ -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \
+ -DBUILD_SHARED_LIBS:BOOL=${XDMF_SHARED_LIBS}\
+- -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS} ${CXX_OPT_FLAGS}"\
++ -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS} ${CXX_OPT_FLAGS} -std=c++98"\
+ -DCMAKE_CXX_COMPILER:STRING=${CXX_COMPILER}\
+ -DCMAKE_C_FLAGS:STRING="${CFLAGS} ${C_OPT_FLAGS}"\
+ -DCMAKE_C_COMPILER:STRING=${C_COMPILER}\