From 3c533440816df8484bcad2f9b2db9c2b68d95819 Mon Sep 17 00:00:00 2001 From: midipix Date: Dec 10 2018 18:04:32 +0000 Subject: python2_host: use sbpython2 to cleanly build the local dependency python2. Signed-off-by: Lucio Andrés Illanes Albornoz --- diff --git a/vars/build.vars b/vars/build.vars index b97c47e..b6e1a98 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -356,8 +356,13 @@ HOST_PACKAGES_DEPS_PREFIX="${PREFIX}"; : ${PKG_EXPAT_HOST_URL:=http://download.openpkg.org/components/cache/expat/expat-${PKG_EXPAT_HOST_VERSION}.tar.bz2}; : ${PKG_PYTHON2_HOST_SHA256SUM:=304c9b202ea6fbd0a4a8e0ad3733715fbd4749f2204a9173a58ec53c32ea73e8}; : ${PKG_PYTHON2_HOST_VERSION:=2.7.14}; -: ${PKG_PYTHON2_HOST_URL:=https://www.python.org/ftp/python/${PKG_PYTHON2_HOST_VERSION}/Python-${PKG_PYTHON2_HOST_VERSION}.tgz}; -: ${PKG_PYTHON2_HOST_CONFIGURE_ARGS_EXTRA:="--enable-ipv6 --enable-shared --enable-unicode=ucs4 --with-system-expat --with-system-ffi"}; +: ${PKG_PYTHON2_HOST_URL:="https://www.python.org/ftp/python/${PKG_PYTHON2_HOST_VERSION}/Python-${PKG_PYTHON2_HOST_VERSION}.tgz"}; +: ${PKG_PYTHON2_HOST_URLS_GIT:="sbpython2=${DEFAULT_GITROOT}/python/sbpython2@main"}; +: ${PKG_PYTHON2_HOST_BASE_DIR:=${BUILD_WORKDIR}/python2_host-host-${DEFAULT_TARGET}}; +: ${PKG_PYTHON2_HOST_BUILD_DIR:=build/python2}; +: ${PKG_PYTHON2_HOST_CONFIGURE:=build/sbpython2/configure}; +: ${PKG_PYTHON2_HOST_CONFIGURE_ARGS:="--source-dir=../../Python-${PKG_PYTHON2_HOST_VERSION} --prefix=${PREFIX}}"}; +: ${PKG_PYTHON2_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_GLIB_HOST_SHA256SUM:=fe22998ff0394ec31e6e5511c379b74011bee61a4421bca7fcab223dfbe0fc6a}; : ${PKG_GLIB_HOST_VERSION:=2.54.0}; : ${PKG_GLIB_HOST_URL:=http://ftp.gnome.org/pub/GNOME/sources/glib/${PKG_GLIB_HOST_VERSION%.[0-9]}/glib-${PKG_GLIB_HOST_VERSION}.tar.xz}; diff --git a/vars/python2_host.vars b/vars/python2_host.vars index 6bdfa9e..58efff9 100644 --- a/vars/python2_host.vars +++ b/vars/python2_host.vars @@ -2,8 +2,10 @@ # set -o errexit -o noglob are assumed. # -pkg_python2_host_clean() { - return 0; +pkg_python2_host_fetch_git() { + ex_rtl_fileop rm "${PKG_BASE_DIR}/sbpython2"; + ex_rtl_fetch_urls_git "${PKG_BASE_DIR}/build" "sbpython2=${DEFAULT_GITROOT}/python/sbpython2@main"; + ex_pkg_state_set "${PKG_NAME}" fetch -extract; }; pkg_python2_host_install_make_post() {