diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2018-12-10 17:35:35 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2018-12-10 17:35:35 +0000 |
| commit | cff33edcaf5274f5f1abc9c48b3b0a79a3740827 (patch) | |
| tree | a5c7586705f3a48f8500d3dd122f441cdfc69ecb | |
| parent | 4542f3eb927ba7973c20e75bc6f26a15d3e9dae6 (diff) | |
| download | midipix_build-cff33edcaf5274f5f1abc9c48b3b0a79a3740827.tar.bz2 midipix_build-cff33edcaf5274f5f1abc9c48b3b0a79a3740827.tar.xz | |
Revert "python2_host: use sbpython2 to build an --all-static python2."
This reverts commit 4397349ecf7f970ace089238c42e45cfca7c952d.
| -rw-r--r-- | vars/build.vars | 8 | ||||
| -rw-r--r-- | vars/mesa.vars | 2 | ||||
| -rw-r--r-- | vars/python2_host.vars | 17 |
3 files changed, 16 insertions, 11 deletions
diff --git a/vars/build.vars b/vars/build.vars index 73dec8fe..b97c47e0 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -356,12 +356,8 @@ 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_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_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_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 5efd1cdd..a2657da0 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"}; +ac_cv_prog_PYTHON2=${PREFIX}/bin/python2.7.wrapper"}; # vim:filetype=sh diff --git a/vars/python2_host.vars b/vars/python2_host.vars index 99f79636..6bdfa9e1 100644 --- a/vars/python2_host.vars +++ b/vars/python2_host.vars @@ -2,10 +2,19 @@ # set -o errexit -o noglob are assumed. # -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_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"; }; # vim:filetype=sh |