DL-Mirrors/termux-packages
0
0
Fork 1
mirror of https://github.com/termux-pacman/termux-packages.git synced 2026-02-23 09:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

python&python2: Fix PATH handling

Browse Source 
After changes to build-package.sh the PATH setup in python&python2
caused the toolchain strip not to be found, causing broken binaries
due to non-stripped elf symbol versioning.

Fixes #460.
This commit is contained in:
Fredrik Fornwall
2016-09-16 07:29:54 -04:00
parent bb97a729ca
commit b2a8800c2c
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/python2/build.sh
View File

@@ -28,9 +28,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-unicode=ucs4"
# Let 2to3 be in the python3 package:
TERMUX_PKG_RM_AFTER_INSTALL="bin/2to3"
# NOTE: termux_step_host_build may not be called if host build is cached.
export TERMUX_ORIG_PATH=$PATH
export PATH=$TERMUX_PKG_HOSTBUILD_DIR:$PATH
termux_step_host_build () {
# We need a host-built Parser/pgen binary, copied into cross-compile build in termux_step_post_configure() below
$TERMUX_PKG_SRCDIR/configure
@@ -46,6 +43,12 @@ termux_step_post_configure () {
$TERMUX_TOUCH -d "next hour" $TERMUX_PKG_BUILDDIR/Parser/pgen
}
termux_step_pre_configure() {
# Put the host-built python in path:
export TERMUX_ORIG_PATH=$PATH
export PATH=$TERMUX_PKG_HOSTBUILD_DIR:$PATH
}
termux_step_post_make_install () {
# Avoid file clashes with the python (3) package:
mv $TERMUX_PREFIX/share/man/man1/{python.1,python2.1}