diff --git a/Programming/Python/build b/Programming/Python/build index 7a36ebe..eb53bfa 100755 --- a/Programming/Python/build +++ b/Programming/Python/build @@ -3,25 +3,39 @@ 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::set_sha256sum 'Python-2.7.12.tgz:3cb522d17463dfa69a155ab18cffa399b358c966c0363d6c8b5b3bf1384da4b6' +pbuild::set_sha256sum 'Python-2.7.14.tgz:304c9b202ea6fbd0a4a8e0ad3733715fbd4749f2204a9173a58ec53c32ea73e8' +pbuild::set_sha256sum 'Python-2.7.16.tgz:01da813a3600876f03f46db11cc5c408175e99f03af2ba942ef324389a83bad5' +pbuild::set_sha256sum 'Python-3.6.3.tgz:ab6193af1921b30f587b302fe385268510e80187ca83ca82d2bfe7ab544c6f91' +pbuild::set_sha256sum 'Python-3.7.3.tgz:d62e3015f2f89c970ac52343976b406694931742fbde2fed8d1ce8ebb4e1f8ff' +pbuild::set_sha256sum 'Python-3.7.4.tgz:d63e63e14e6d29e17490abbe6f7d17afb3db182dbd801229f14e55f4157c4ba3' pbuild::add_to_group 'Programming' -pbuild::pre_configure_Linux() { +pbuild::pre_configure() { + local -a cflags=() + local -a ldflags=() + + cflags+=("-fPIC") + cflags+=("-I${XZ_INCLUDE_DIR}") + + ldflags+=("-L${XZ_LIBRARY_DIR}") + 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" + cflags+=("-I${OPENSSL_INCLUDE_DIR}" "-I${OPENSSL_INCLUDE_DIR}/openssl") + ldflags+=("-L${OPENSSL_LIBRARY_DIR}") 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::add_configure_args "CFLAGS=${cflags[*]}" + pbuild::add_configure_args "LDFLAGS=${ldflags[*]}" + pbuild::add_configure_args "--enable-shared" +} + +pbuild::pre_configure_Linux() { + 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" } pbuild::post_install_Linux() {