diff --git a/packages/python-apt/build.sh b/packages/python-apt/build.sh index 2abf6ac4f3..25905b7062 100644 --- a/packages/python-apt/build.sh +++ b/packages/python-apt/build.sh @@ -21,10 +21,6 @@ termux_step_pre_configure() { popd . ${_CROSSENV_PREFIX}/bin/activate - pushd ${_CROSSENV_PREFIX}/build/lib/python${_PYTHON_VERSION}/site-packages - patch --silent -p1 < $TERMUX_PKG_BUILDER_DIR/setuptools-44.1.1-no-bdist_wininst.diff || : - popd - LDFLAGS+=" -lpython${_PYTHON_VERSION}" } diff --git a/packages/python-apt/setuptools-44.1.1-no-bdist_wininst.diff b/packages/python-apt/setuptools-44.1.1-no-bdist_wininst.diff deleted file mode 100644 index ed7f7e7b51..0000000000 --- a/packages/python-apt/setuptools-44.1.1-no-bdist_wininst.diff +++ /dev/null @@ -1,35 +0,0 @@ -Copyright (C) 2016 Jason R Coombs - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - ---- a/setuptools/command/install_scripts.py -+++ b/setuptools/command/install_scripts.py -@@ -32,12 +32,7 @@ - ) - bs_cmd = self.get_finalized_command('build_scripts') - exec_param = getattr(bs_cmd, 'executable', None) -- bw_cmd = self.get_finalized_command("bdist_wininst") -- is_wininst = getattr(bw_cmd, '_is_running', False) - writer = ei.ScriptWriter -- if is_wininst: -- exec_param = "python.exe" -- writer = ei.WindowsScriptWriter - if exec_param == sys.executable: - # In case the path to the Python executable contains a space, wrap - # it so it's not split up.