From 4397349ecf7f970ace089238c42e45cfca7c952d Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Mon, 10 Dec 2018 09:19:00 -0500
Subject: python2_host: use sbpython2 to build an --all-static python2.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
---
 vars/build.vars        |  8 ++++++--
 vars/mesa.vars         |  2 +-
 vars/python2_host.vars | 17 ++++-------------
 3 files changed, 11 insertions(+), 16 deletions(-)

(limited to 'vars')

diff --git a/vars/build.vars b/vars/build.vars
index d5462a62..58b573d1 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -356,8 +356,12 @@ 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:="--all-static --source-dir=../../Python-${PKG_PYTHON2_HOST_VERSION} --prefix=}"};
 : ${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/mesa.vars b/vars/mesa.vars
index a2657da0..5efd1cdd 100644
--- a/vars/mesa.vars
+++ b/vars/mesa.vars
@@ -3,6 +3,6 @@
 #
 
 : ${PKG_MESA_CONFIG_CACHE_EXTRA:="
-ac_cv_prog_PYTHON2=${PREFIX}/bin/python2.7.wrapper"};
+ac_cv_prog_PYTHON2=${PREFIX}/bin/python2.7"};
 
 # vim:filetype=sh
diff --git a/vars/python2_host.vars b/vars/python2_host.vars
index 6bdfa9e1..99f79636 100644
--- a/vars/python2_host.vars
+++ b/vars/python2_host.vars
@@ -2,19 +2,10 @@
 # set -o errexit -o noglob are assumed.
 #
 
-pkg_python2_host_clean() {
-	return 0;
-};
-
-pkg_python2_host_install_make_post() {
-	if ex_rtl_fileop test "${PKG_DESTDIR}/bin/python2.7.wrapper"; then
-		ex_rtl_fileop rm "${PKG_DESTDIR}/bin/python2.7.wrapper";
-	fi;
-	cat > "${PKG_DESTDIR}/bin/python2.7.wrapper" <<EOF
-#!/bin/sh
-env LD_LIBRARY_PATH="${PREFIX}/lib" "${PREFIX}/bin/python2.7" "\${@}";
-EOF
-        chmod +x "${PKG_DESTDIR}/bin/python2.7.wrapper";
+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;
 };
 
 # vim:filetype=sh
-- 
cgit v1.2.3