diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2018-07-09 16:14:19 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2018-07-09 16:14:19 +0000 |
| commit | 7fb90aa5b340b4a910ec8dd0f84ac8a630cf7ffa (patch) | |
| tree | 1148323b9d0310ac1306b99a75c15950a7de1b72 | |
| parent | 9460bbf634b77cbd0a3426dd1d1466bb1d39df03 (diff) | |
| download | midipix_build-7fb90aa5b340b4a910ec8dd0f84ac8a630cf7ffa.tar.bz2 midipix_build-7fb90aa5b340b4a910ec8dd0f84ac8a630cf7ffa.tar.xz | |
vars/build.vars:python3{,_host}:${PKG_CONFIGURE_ARGS{,_EXTRA}: build w/ --with-system-expat --with-system-ffi.
vars/python3{,_host}.vars:pkg_configure_pre(): remove in-tree Modules/zlib/ (via Redfoxmoon.)
| -rw-r--r-- | vars/build.vars | 4 | ||||
| -rw-r--r-- | vars/python3.vars | 1 | ||||
| -rw-r--r-- | vars/python3_host.vars | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/vars/build.vars b/vars/build.vars index caa232aa..7e2300a3 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -380,7 +380,7 @@ HOST_PACKAGES_DEPS_PREFIX="${PREFIX}"; : ${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 --without-ensurepip --with-system-expat"}; +: ${PKG_PYTHON3_HOST_CONFIGURE_ARGS_EXTRA:="--enable-ipv6 --enable-shared --with-system-expat --with-system-ffi --without-ensurepip"}; : ${PKG_PYTHON3_HOST_SUBDIR:=Python-${PKG_PYTHON3_HOST_VERSION}}; : ${PKG_RUBY_HOST_SHA256SUM:=ba5ba60e5f1aa21b4ef8e9bf35b9ddb57286cb546aac4b5a28c71f459467e507}; : ${PKG_RUBY_HOST_VERSION:=2.3.0}; @@ -1061,7 +1061,7 @@ patch patchutils perl python2 python3 ruby smallbasic tcl"; : ${PKG_PYTHON3_SHA256SUM:=687e067d9f391da645423c7eda8205bae9d35edc0c76ef5218dcbe4cc770d0d7}; : ${PKG_PYTHON3_VERSION:=3.5.1}; : ${PKG_PYTHON3_URL:=https://www.python.org/ftp/python/${PKG_PYTHON3_VERSION}/Python-${PKG_PYTHON3_VERSION}.tgz}; -: ${PKG_PYTHON3_CONFIGURE_ARGS:="--build=x86_64 -C --enable-ipv6 --enable-shared --host=${DEFAULT_TARGET} --prefix=${PREFIX_NATIVE} --without-ensurepip"}; +: ${PKG_PYTHON3_CONFIGURE_ARGS:="--build=x86_64 -C --enable-ipv6 --enable-shared --host=${DEFAULT_TARGET} --prefix=${PREFIX_NATIVE} --with-system-expat --with-system-ffi --without-ensurepip"}; : ${PKG_PYTHON3_ENV_VARS_EXTRA:="BLDSHARED=${DEFAULT_TARGET}-gcc -shared -mout-dsolib --sysroot=${PREFIX_NATIVE}:CC=${DEFAULT_TARGET}-gcc:CFLAGS=--sysroot=${PREFIX_NATIVE}:CPPFLAGS=--sysroot=${PREFIX_NATIVE}:LDFLAGS=-L${PREFIX_NATIVE}/lib"}: : ${PKG_PYTHON3_INSTALL_FILES:="@python3=bin/python"}; : ${PKG_PYTHON3_SUBDIR:=Python-${PKG_PYTHON3_VERSION}}; diff --git a/vars/python3.vars b/vars/python3.vars index b193fa5e..3c3fb58f 100644 --- a/vars/python3.vars +++ b/vars/python3.vars @@ -12,6 +12,7 @@ pkg_python3_configure_pre() { PGEN=Parser/hostpgen Parser/hostpgen; make distclean); ex_rtl_fileop mv "../${PKG_SUBDIR}/config.cache" .; + ex_rtl_fileop rm "../${PKG_SUBDIR}/Modules/zlib"; }; # vim:filetype=sh diff --git a/vars/python3_host.vars b/vars/python3_host.vars index 8f4817c2..51705fbe 100644 --- a/vars/python3_host.vars +++ b/vars/python3_host.vars @@ -2,6 +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"; |