diff --git a/Programming/Python/build b/Programming/Python/build index e6afdd9..7a36ebe 100755 --- a/Programming/Python/build +++ b/Programming/Python/build @@ -6,19 +6,32 @@ pbuild::set_sha256sum 'Python-3.7.3.tgz:d62e3015f2f89c970ac52343976b406694931742 pbuild::add_to_group 'Programming' -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" -elif (( V_MAJOR == 3 )) && (( V_MINOR <= 6 )); 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::pre_configure_Linux() { + if (( V_MAJOR == 2 || (V_MAJOR == 3 && V_MINOR <= 6) )); then + pbuild::add_configure_args "CFLAGS=-fPIC -I${XZ_INCLUDE_DIR} -I${OPENSSL_INCLUDE_DIR} -I${OPENSSL_INCLUDE_DIR}/openssl" + pbuild::add_configure_args "LDFLAGS=-L${XZ_LIBRARY_DIR} -L${OPENSSL_LIBRARY_DIR}" + pbuild::add_configure_args "--enable-shared" + pbuild::add_configure_args "--with-tcltk-includes=-I${TCLTK_INCLUDE_DIR}" + pbuild::add_configure_args "--with-tcltk-libs=-L${TCLTK_LIBRARY_DIR} -ltcl8.6 -ltk8.6" + else + pbuild::add_configure_args "CFLAGS=-I${XZ_INCLUDE_DIR}" + pbuild::add_configure_args "LDFLAGS=-L${XZ_LIBRARY_DIR}" + pbuild::add_configure_args "--enable-shared" + pbuild::add_configure_args "--with-openssl=${OPENSSL_DIR}" + pbuild::add_configure_args "--enable-optimizations" + pbuild::add_configure_args "--with-tcltk-includes=-I${TCLTK_INCLUDE_DIR}" + pbuild::add_configure_args "--with-tcltk-libs=-L${TCLTK_LIBRARY_DIR} -ltcl8.6 -ltk8.6" + fi +} + +pbuild::post_install_Linux() { + install "${OPENSSL_LIBRARY_DIR}"/libcrypto.so.* "${PREFIX}/lib" + install "${OPENSSL_LIBRARY_DIR}"/libssl.so.* "${PREFIX}/lib" + install "${TCLTK_LIBRARY_DIR}"/libtcl*.so "${PREFIX}/lib" + install "${TCLTK_LIBRARY_DIR}"/libtk*.so "${PREFIX}/lib" + install "${XZ_LIBRARY_DIR}"/liblzma.so.* "${PREFIX}/lib" + install /usr/lib64/libffi.so.* "${PREFIX}/lib" +} pbuild::post_install() { export LD_LIBRARY_PATH+=":${PREFIX}/lib" @@ -52,6 +65,9 @@ pbuild::post_install() { std::info "Building h5py\n" pip${V_MAJOR} install h5py + + std::info "Building pandas\n" + pip${V_MAJOR} install pandas } diff --git a/Programming/Python/files/variants.rhel6 b/Programming/Python/files/variants.rhel6 index eeb9dbd..944394c 100644 --- a/Programming/Python/files/variants.rhel6 +++ b/Programming/Python/files/variants.rhel6 @@ -1,9 +1,9 @@ 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/2.7.16 unstable b:openssl/1.0.2r b:TclTk/8.6.9 b:xz/5.2.4 Python/3.4.0 deprecated openssl/1.0.2m Tcl/8.6.4 Tk/8.6.4 Python/3.4.3 stable openssl/1.0.2m Tcl/8.6.4 Tk/8.6.4 -Python/3.6.3 unstable openssl/1.0.2r TclTk/8.6.9 b:xz/5.2.4 -Python/3.7.3 unstable openssl/1.0.2r TclTk/8.6.9 b:xz/5.2.4 -Python/3.7.4 unstable openssl/1.0.2r TclTk/8.6.9 b:xz/5.2.4 +Python/3.6.3 unstable b:openssl/1.0.2r b:TclTk/8.6.9 b:xz/5.2.4 +Python/3.7.3 unstable b:openssl/1.0.2r b:TclTk/8.6.9 b:xz/5.2.4 +Python/3.7.4 unstable b:openssl/1.0.2r b:TclTk/8.6.9 b:xz/5.2.4