From 96be60b8bf2c41b6191341fad9bdec7f3fb01bf0 Mon Sep 17 00:00:00 2001 From: midipix Date: Tue, 18 Dec 2018 21:26:53 -0500 Subject: python3_host: use sbpython3 to cleanly build the local dependency python3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lucio Andrés Illanes Albornoz --- vars/build.vars | 13 +++++++++---- vars/python3_host.vars | 18 ++++-------------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/vars/build.vars b/vars/build.vars index 730152d8..f0aa8892 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -391,10 +391,15 @@ HOST_PACKAGES_DEPS_PREFIX="${PREFIX}"; : ${PKG_INTLTOOL_HOST_SHA256SUM:=67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd}; : ${PKG_INTLTOOL_HOST_VERSION:=0.51.0}; : ${PKG_INTLTOOL_HOST_URL:=https://launchpad.net/intltool/trunk/${PKG_INTLTOOL_HOST_VERSION}/+download/intltool-${PKG_INTLTOOL_HOST_VERSION}.tar.gz}; -: ${PKG_PYTHON3_HOST_SHA256SUM:=687e067d9f391da645423c7eda8205bae9d35edc0c76ef5218dcbe4cc770d0d7}; -: ${PKG_PYTHON3_HOST_VERSION:=3.5.1}; -: ${PKG_PYTHON3_HOST_URL:=https://www.python.org/ftp/python/${PKG_PYTHON3_HOST_VERSION}/Python-${PKG_PYTHON3_HOST_VERSION}.tgz}; -: ${PKG_PYTHON3_HOST_CONFIGURE_ARGS_EXTRA:="--enable-ipv6 --enable-shared --with-system-expat --with-system-ffi --without-ensurepip"}; +: ${PKG_PYTHON3_HOST_SHA256SUM:=ab6193af1921b30f587b302fe385268510e80187ca83ca82d2bfe7ab544c6f91}; +: ${PKG_PYTHON3_HOST_VERSION:=3.6.3}; +: ${PKG_PYTHON3_HOST_URL:="https://www.python.org/ftp/python/${PKG_PYTHON3_HOST_VERSION}/Python-${PKG_PYTHON3_HOST_VERSION}.tgz"}; +: ${PKG_PYTHON3_HOST_URLS_GIT:="sbpython3=${DEFAULT_GITROOT}/python/sbpython3@main"}; +: ${PKG_PYTHON3_HOST_BASE_DIR:=${BUILD_WORKDIR}/python3_host-host-${DEFAULT_TARGET}}; +: ${PKG_PYTHON3_HOST_BUILD_DIR:=build/python3}; +: ${PKG_PYTHON3_HOST_CONFIGURE:=build/sbpython3/configure}; +: ${PKG_PYTHON3_HOST_CONFIGURE_ARGS:="--source-dir=../../Python-${PKG_PYTHON3_HOST_VERSION} --prefix=${PREFIX}}"}; +: ${PKG_PYTHON3_HOST_MAKEFLAGS_INSTALL_EXTRA:="PREFIX= EXEC_PREFIX= BINDIR=/bin SBINDIR=/sbin LIBDIR=/lib INCLUDEDIR=/include OLDINCLUDEDIR=/include MANDIR=/share/man DOCDIR=/share/doc LIBEXECDIR=/libexec"}; : ${PKG_PYTHON3_HOST_SUBDIR:=Python-${PKG_PYTHON3_HOST_VERSION}}; : ${PKG_RUBY_HOST_SHA256SUM:=ba5ba60e5f1aa21b4ef8e9bf35b9ddb57286cb546aac4b5a28c71f459467e507}; : ${PKG_RUBY_HOST_VERSION:=2.3.0}; diff --git a/vars/python3_host.vars b/vars/python3_host.vars index 51705fbe..f0063efe 100644 --- a/vars/python3_host.vars +++ b/vars/python3_host.vars @@ -2,20 +2,10 @@ # set -o errexit -o noglob are assumed. # -pkg_python3_host_configure_pre() { - ex_rtl_fileop rm "${PKG_SUBDIR}/Modules/zlib"; -}; - -pkg_python3_host_install_make_post() { - if ex_rtl_fileop test "${PKG_DESTDIR}/bin/python3"; then - ex_rtl_fileop rm "${PKG_DESTDIR}/bin/python3"; - fi; - cat > "${PKG_DESTDIR}/bin/python3" <