From 94ab320acc3ae2e63ac1937b5853963e5f1d0150 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Thu, 11 Oct 2018 17:50:47 +0200
Subject: [PATCH] Compiler/SuperLU - reviewed

---
 Compiler/SuperLU/build          | 43 ++++++++++++---------------------
 Compiler/SuperLU/files/variants | 17 +++++++------
 2 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/Compiler/SuperLU/build b/Compiler/SuperLU/build
index bf48efb..0957aa7 100755
--- a/Compiler/SuperLU/build
+++ b/Compiler/SuperLU/build
@@ -1,10 +1,13 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_$V.tar.gz"
+pbuild::set_download_url "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_${V_PKG}.tar.gz"
+pbuild::add_to_group 'Compiler'
+pbuild::install_docfiles 'README'
 
 if (( V_MAJOR < 5 )); then
-pbuild::configure() {
-	cat <<EOF > "${SRC_DIR}/make.inc"
+	pbuild::compile_in_sourcetree
+	pbuild::configure() {
+		cat <<EOF > "${SRC_DIR}/make.inc"
 PLAT		= 
 SuperLUroot 	= \${PREFIX}
 SUPERLULIB   	= \$(SuperLUroot)/lib/libsuperlu.a
@@ -28,31 +31,15 @@ LOADOPTS	= -fopenmp
 CDEFS        = -DAdd_ 
 EOF
 }
-else
-pbuild::configure() {
-	cmake "${SRC_DIR}" \
-		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-		|| exit 1 
 
-}
+	pbuild::pre_compile() {
+		mkdir -p "${PREFIX}/lib"
+	}
+
+	pbuild::post_install() {
+		mkdir -p "${PREFIX}/include"
+		install -m 0444 "${SRC_DIR}"/SRC/*.h "${PREFIX}/include"
+	}
+
 fi
 
-pbuild::compile() {
-	if (( V_MAJOR < 5 )); then
-		cd "${SRC_DIR}"
-		mkdir -p "${PREFIX}/lib"
-	fi
-	make
-}
-
-pbuild::install() {
-	make install
-	mkdir -p "${PREFIX}/include"
-	install -m 0444 "${SRC_DIR}"/SRC/*.h "${PREFIX}/include"
-}
-
-pbuild::add_to_group 'Compiler'
-pbuild::compile_in_sourcetree
-pbuild::install_docfiles 'README'
-pbuild::make_all
-pbuild::cleanup_src
diff --git a/Compiler/SuperLU/files/variants b/Compiler/SuperLU/files/variants
index 8d49c56..bebe2ad 100644
--- a/Compiler/SuperLU/files/variants
+++ b/Compiler/SuperLU/files/variants
@@ -1,8 +1,11 @@
-SuperLU/4.3          stable     gcc/4.7.4 b:OpenBLAS/0.2.9
-SuperLU/4.3          stable     gcc/4.8.3 b:OpenBLAS/0.2.9
-SuperLU/4.3          stable     gcc/4.8.4 b:OpenBLAS/0.2.9
-SuperLU/4.3          stable     gcc/4.9.2 b:OpenBLAS/0.2.9
-SuperLU/4.3          stable     gcc/4.9.3 b:OpenBLAS/0.2.9
-SuperLU/4.3          stable     gcc/5.3.0 b:OpenBLAS/0.2.9
-SuperLU/4.3          stable     gcc/6.1.0 b:OpenBLAS/0.2.9
+SuperLU/4.3          	stable		gcc/4.7.4 b:OpenBLAS/0.2.9
+SuperLU/4.3          	stable     	gcc/4.8.3 b:OpenBLAS/0.2.9
+SuperLU/4.3          	stable     	gcc/4.8.4 b:OpenBLAS/0.2.9
+SuperLU/4.3          	stable     	gcc/4.9.2 b:OpenBLAS/0.2.9
+SuperLU/4.3          	stable     	gcc/4.9.3 b:OpenBLAS/0.2.9
+SuperLU/4.3          	stable     	gcc/5.3.0 b:OpenBLAS/0.2.9
+SuperLU/4.3          	stable     	gcc/6.1.0 b:OpenBLAS/0.2.9
 
+SuperLU/5.2.1		unstable	gcc/4.8.5 b:OpenBLAS/0.2.19 b:cmake/3.6.3
+SuperLU/5.2.1		unstable	gcc/5.4.0 b:OpenBLAS/0.2.19 b:cmake/3.6.3
+SuperLU/5.2.1		unstable	gcc/7.3.0 b:OpenBLAS/0.2.20 b:cmake/3.9.6