Fix build of python after build-package.sh rewrite
This commit is contained in:
parent
a3f2fff585
commit
2b0e9dc9e2
|
@ -170,6 +170,9 @@ termux_step_setup_variables() {
|
||||||
termux_error_exit "Wrong NDK version - we need $TERMUX_NDK_VERSION"
|
termux_error_exit "Wrong NDK version - we need $TERMUX_NDK_VERSION"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# The build tuple that may be given to --build configure flag:
|
||||||
|
TERMUX_BUILD_TUPLE=$(sh "$TERMUX_SCRIPTDIR/scripts/config.guess")
|
||||||
|
|
||||||
# We do not put all of build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/ into PATH
|
# We do not put all of build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/ into PATH
|
||||||
# to avoid stuff like arm-linux-androideabi-ld there to conflict with ones from
|
# to avoid stuff like arm-linux-androideabi-ld there to conflict with ones from
|
||||||
# the standalone toolchain.
|
# the standalone toolchain.
|
||||||
|
@ -551,7 +554,7 @@ termux_step_setup_toolchain() {
|
||||||
chmod +x "$PKG_CONFIG"
|
chmod +x "$PKG_CONFIG"
|
||||||
}
|
}
|
||||||
|
|
||||||
# This should not be overridden by packages.
|
# Apply all *.patch files for the package. Not to be overridden by packages.
|
||||||
termux_step_patch_package () {
|
termux_step_patch_package () {
|
||||||
cd "$TERMUX_PKG_SRCDIR"
|
cd "$TERMUX_PKG_SRCDIR"
|
||||||
# Suffix patch with ".patch32" or ".patch64" to only apply for these bitnesses:
|
# Suffix patch with ".patch32" or ".patch64" to only apply for these bitnesses:
|
||||||
|
@ -563,8 +566,6 @@ termux_step_patch_package () {
|
||||||
|
|
||||||
find . -name config.sub -exec chmod u+w '{}' \; -exec cp "$TERMUX_SCRIPTDIR/scripts/config.sub" '{}' \;
|
find . -name config.sub -exec chmod u+w '{}' \; -exec cp "$TERMUX_SCRIPTDIR/scripts/config.sub" '{}' \;
|
||||||
find . -name config.guess -exec chmod u+w '{}' \; -exec cp "$TERMUX_SCRIPTDIR/scripts/config.guess" '{}' \;
|
find . -name config.guess -exec chmod u+w '{}' \; -exec cp "$TERMUX_SCRIPTDIR/scripts/config.guess" '{}' \;
|
||||||
# The host tuple that may be given to --host configure flag, but normally autodetected so not needed explicitly
|
|
||||||
TERMUX_HOST_TUPLE=$(sh "$TERMUX_SCRIPTDIR/scripts/config.guess")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# For package scripts to override. Called in $TERMUX_PKG_BUILDDIR.
|
# For package scripts to override. Called in $TERMUX_PKG_BUILDDIR.
|
||||||
|
|
|
@ -22,7 +22,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_ftime=no"
|
||||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_faccessat=no"
|
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_faccessat=no"
|
||||||
# The gethostbyname_r function does not exist on device libc:
|
# The gethostbyname_r function does not exist on device libc:
|
||||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_gethostbyname_r=no"
|
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_gethostbyname_r=no"
|
||||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --build=$TERMUX_HOST_TUPLE --with-system-ffi --without-ensurepip"
|
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --build=$TERMUX_BUILD_TUPLE --with-system-ffi --without-ensurepip"
|
||||||
# Hard links does not work on Android 6:
|
# Hard links does not work on Android 6:
|
||||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_linkat=no"
|
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_linkat=no"
|
||||||
# Posix semaphores are not supported on Android:
|
# Posix semaphores are not supported on Android:
|
||||||
|
|
|
@ -23,7 +23,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_faccessat=no"
|
||||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_gethostbyname_r=no"
|
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_gethostbyname_r=no"
|
||||||
# Do not assume getaddrinfo is buggy when cross compiling:
|
# Do not assume getaddrinfo is buggy when cross compiling:
|
||||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_buggy_getaddrinfo=no"
|
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_buggy_getaddrinfo=no"
|
||||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --build=$TERMUX_HOST_TUPLE --with-system-ffi --without-ensurepip"
|
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --build=$TERMUX_BUILD_TUPLE --with-system-ffi --without-ensurepip"
|
||||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-unicode=ucs4"
|
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-unicode=ucs4"
|
||||||
|
|
||||||
# Let 2to3 be in the python3 package:
|
# Let 2to3 be in the python3 package:
|
||||||
|
|
Loading…
Reference in New Issue