Toolchain: Update to spglib 1.12.2

cp2k · Mar 12, 2019 · f95bf01 · f95bf01
1 parent fb915d0
commit f95bf01
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/tools/toolchain/scripts/checksums.sha256 b/tools/toolchain/scripts/checksums.sha256
@@ -114,6 +114,7 @@ e40b8f018c1da64edd1cc9a6fce5fa63b2e707e404e20cad91fbae337c98a5b7 *make-4.2.1.tar
 1267ff06aaedc04ca25f7c6026687ea2884b837043431195f153401d942b28df *hdf5-1.10.4.tar.bz2
 6a15a324a821ad9d3e615e120d9c5e704e284d8eb1f076aa21741a23fbcf08df *spglib-1.10.4.tar.gz
 1765e68982425de6d30029d50d200f20425b8ed1deff52b8e73a4a1457ac9ab6 *spglib-1.12.1.tar.gz
+d92f5e4fa0f54cc0abd0209b81c4d5c647dae9d25b774c2296f44b8558b17976 *spglib-1.12.2.tar.gz
 406d4db9b48f5a618143d5547faeb4a3a3c69cd321068d842387c4e789acfb8f *2263d68f611a0df565968c5019d0605bc199669f.patch
 13be3b336a3b665228fd68af3b7143457dfbf655d49e7458cd811f8adb8323fa *SIRIUS-5.8.3.tar.gz
 34da2add5edf993055a7dae4770b3a2d40214aaaed3f635a581aa26aee61b7bc *SIRIUS-6.0.0.tar.gz

diff --git a/tools/toolchain/scripts/install_spglib.sh b/tools/toolchain/scripts/install_spglib.sh
@@ -1,10 +1,7 @@
 #!/bin/bash -e
 [ "${BASH_SOURCE[0]}" ] && SCRIPT_NAME="${BASH_SOURCE[0]}" || SCRIPT_NAME=$0
 SCRIPT_DIR="$(cd "$(dirname "$SCRIPT_NAME")" && pwd -P)"
-spglib_ver=${spglib_ver:-1.12.1}
-patches=(
-    "https://github.com/dev-zero/spglib/commit/2263d68f611a0df565968c5019d0605bc199669f.patch" # memory leak fix
-    )
+spglib_ver=${spglib_ver:-1.12.2}
 
 source "${SCRIPT_DIR}"/common_vars.sh
 source "${SCRIPT_DIR}"/tool_kit.sh
@@ -32,25 +29,11 @@ case "$with_spglib" in
                              -o spglib-${spglib_ver}.tar.gz
             fi
 
-            for patch in "${patches[@]}" ; do
-                fname="${patch##*/}"
-                if [ -f "${fname}" ] ; then
-                    echo "${fname} is found"
-                else
-                    # parallel build patch
-                    download_pkg ${DOWNLOADER_FLAGS} "${patch}"
-                fi
-            done
-
             echo "Installing from scratch into ${pkg_install_dir}"
             [ -d spglib-${spglib_ver} ] && rm -rf spglib-${spglib_ver}
             tar -xzf spglib-${spglib_ver}.tar.gz
             cd spglib-${spglib_ver}
 
-            for patch in "${patches[@]}" ; do
-                patch -p1 < ../"${patch##*/}"
-            done
-
             mkdir build
             cd build
             cmake -DCMAKE_INSTALL_PREFIX="${pkg_install_dir}" -DCMAKE_BUILD_TYPE=Release .. > configure.log 2>&1