From 6f9b00b106e8bb4fd0c0490db08dc16868c3ea2c Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Tue, 20 Aug 2019 17:42:45 +0200
Subject: [PATCH] variants for Python 2.7.16-1 and 3.7.3 added, fixes in
 build-script

---
 Programming/Python/build          | 25 +++++++++++++++++++++----
 Programming/Python/files/variants |  5 +++--
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/Programming/Python/build b/Programming/Python/build
index 3de7553..378061a 100755
--- a/Programming/Python/build
+++ b/Programming/Python/build
@@ -1,13 +1,20 @@
 #!/usr/bin/env modbuild
 
 pbuild::set_download_url "https://www.python.org/ftp/python/${V_PKG}/$P-${V_PKG}.tgz"
+
+pbuild::set_sha256sum 'Python-3.7.3.tgz:d62e3015f2f89c970ac52343976b406694931742fbde2fed8d1ce8ebb4e1f8ff'
+
 pbuild::add_to_group 'Programming'
 
-pbuild::pre_configure() {
+if (( V_MAJOR == 2 )); then
 	pbuild::add_configure_args "LDFLAGS=-L${OPENSSL_LIBRARY_DIR}"
 	pbuild::add_configure_args "CPPFLAGS=-fPIC -I${OPENSSL_INCLUDE_DIR} -I${OPENSSL_INCLUDE_DIR}/openssl"
 	pbuild::add_configure_args "--enable-shared"
-}
+else
+	pbuild::add_configure_args "--enable-shared"
+	pbuild::add_configure_args "--with-openssl=${OPENSSL_DIR}"
+	pbuild::add_configure_args "--enable-optimizations"
+fi
 
 pbuild::post_install() {
 	export LD_LIBRARY_PATH+=":${PREFIX}/lib"
@@ -20,14 +27,24 @@ pbuild::post_install() {
 	PATH+=":${PREFIX}/bin"
 	cd "${BUILDBLOCK_DIR}"
 	"${PREFIX}/bin/python" 'get-pip.py'
+
+	std::info "Building numpy\n"
 	pip${V_MAJOR} install numpy
+
+	std::info "Building scipy\n"
 	pip${V_MAJOR} install scipy
+
+	std::info "Building matplotlub\n"
 	pip${V_MAJOR} install matplotlib
+
+	std::info "Building ipython\n"
 	pip${V_MAJOR} install ipython
-	#pip${V_MAJOR} install pandas
+
+	std::info "Building sympy\n"
 	pip${V_MAJOR} install sympy
+
+	std::info "Building nose\n"
 	pip${V_MAJOR} install nose
-	#pip${V_MAJOR} install mpi4py
 }
 
 
diff --git a/Programming/Python/files/variants b/Programming/Python/files/variants
index 79a586b..4dbe3aa 100644
--- a/Programming/Python/files/variants
+++ b/Programming/Python/files/variants
@@ -2,5 +2,6 @@ Python/2.7.11	stable	openssl/1.0.2j Tcl/8.6.4 Tk/8.6.4
 Python/2.7.12	stable	openssl/1.0.2j Tcl/8.6.4 Tk/8.6.4
 Python/2.7.14	stable	openssl/1.0.2o Tcl/8.6.4 Tk/8.6.4
 Python/2.7.16	stable	openssl/1.0.2r Tcl/8.6.9 Tk/8.6.9
-Python/3.6.3	stable	openssl/1.0.2m Tcl/8.6.4 Tk/8.6.4
-Python/3.7.3	unstable	openssl/1.0.2r Tcl/8.6.9 Tk/8.6.9
+Python/2.7.16-1	unstable	openssl/1.0.2r TclTk/8.6.9 b:xz/5.2.4
+Python/3.6.3	stable		openssl/1.0.2m Tcl/8.6.4 Tk/8.6.4
+Python/3.7.3	unstable	openssl/1.0.2r TclTk/8.6.9 b:xz/5.2.4