From c1a6f49cb9cdadcd0d4886dfdde1f256d63c3547 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Wed, 20 Jun 2018 11:20:56 +0300 Subject: [PATCH] cython: Fix patching shebang --- mingw-w64-cython/PKGBUILD | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/mingw-w64-cython/PKGBUILD b/mingw-w64-cython/PKGBUILD index 0a3d362baa..329e88076b 100644 --- a/mingw-w64-cython/PKGBUILD +++ b/mingw-w64-cython/PKGBUILD @@ -5,7 +5,7 @@ _realname=cython pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-cython" "${MINGW_PACKAGE_PREFIX}-cython2") pkgver=0.28.3 -pkgrel=1 +pkgrel=2 pkgdesc="C-Extensions for Python (mingw-w64)" arch=('any') url="http://www.cython.org" @@ -33,13 +33,14 @@ package_cython() { cd "${srcdir}/python3-build-${CARCH}" MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ DISTUTILS_DEBUG=1 \ - ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \ - --root="${pkgdir}" --optimize=1 + ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \ + --root="${pkgdir}" --optimize=1 - # Our setuptools {gui,cli}{,-32,-64}.exe have special-case handling for /usr/bin/env such that - # they look in PATH. -# sed -i 's|#!.*|#!/usr/bin/env python3|' ${pkgdir}/${MINGW_PREFIX}/bin/cy{gdb,thon}-script.py - sed -i "s|#!.*|#!${MINGW_PREFIX}/bin/python3|" ${pkgdir}/${MINGW_PREFIX}/bin/cy{gdb,thon}-script.py + local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX}) + # fix python command in files + for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do + sed -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f} + done } package_cython2() { @@ -47,13 +48,14 @@ package_cython2() { cd "${srcdir}/python2-build-${CARCH}" DISTUTILS_DEBUG=1 \ MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ - ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} \ - --root="${pkgdir}" --optimize=1 + ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} \ + --root="${pkgdir}" --optimize=1 - # Our setuptools {gui,cli}{,-32,-64}.exe have special-case handling for /usr/bin/env such that - # they look in PATH. -# sed -i 's|#!.*|#!/usr/bin/env python2|' ${pkgdir}/${MINGW_PREFIX}/bin/cy{gdb,thon}-script.py - sed -i "s|#!.*|#!${MINGW_PREFIX}/bin/python2|" ${pkgdir}/${MINGW_PREFIX}/bin/cy{gdb,thon}-script.py + local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX}) + # fix python command in files + for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do + sed -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f} + done mv ${pkgdir}${MINGW_PREFIX}/bin/cygdb{,2}.exe mv ${pkgdir}${MINGW_PREFIX}/bin/cython{,2}.exe @@ -70,7 +72,7 @@ package_cython2() { } package_mingw-w64-i686-cython() { - install=${_realname}2-${CARCH}.install + install=${_realname}-${CARCH}.install package_cython } @@ -80,7 +82,7 @@ package_mingw-w64-i686-cython2() { } package_mingw-w64-x86_64-cython() { - install=${_realname}2-${CARCH}.install + install=${_realname}-${CARCH}.install package_cython }