sergiotarxz
/
termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

zlib-dev: breaks and replaces old ndk-sysroot 

also bump toolchain version for z{lib,conf}.h removal
This commit is contained in:
Tom Yan 2019-04-14 20:22:02 +08:00 committed by Leonid Pliushch
parent 5170610f52
commit dab21ee7b7
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/ndk-sysroot/build.sh
View File

@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://developer.android.com/tools/sdk/ndk/index.html
TERMUX_PKG_DESCRIPTION="System header and library files from the Android NDK needed for compiling C programs"
TERMUX_PKG_LICENSE="NCSA"
TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION
TERMUX_PKG_REVISION=2
TERMUX_PKG_REVISION=3
TERMUX_PKG_NO_DEVELSPLIT=yes
TERMUX_PKG_KEEP_STATIC_LIBRARIES="true"
# This package has taken over <pty.h> from the previous libutil-dev

2
packages/zlib/build.sh
View File

@ -4,6 +4,8 @@ TERMUX_PKG_LICENSE="ZLIB"
TERMUX_PKG_VERSION=1.2.11
TERMUX_PKG_SHA256=4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066
TERMUX_PKG_SRCURL=https://www.zlib.net/zlib-$TERMUX_PKG_VERSION.tar.xz
TERMUX_PKG_DEVPACKAGE_BREAKS="ndk-sysroot (<< 19b-2)"
TERMUX_PKG_DEVPACKAGE_REPLACES="ndk-sysroot (<< 19b-2)"
termux_step_configure() {
"$TERMUX_PKG_SRCDIR/configure" --prefix=$TERMUX_PREFIX

2
scripts/build/termux_step_start_build.sh
View File

@ -5,7 +5,7 @@ termux_step_start_build() {
TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_COMMON_CACHEDIR/${TERMUX_NDK_VERSION}-${TERMUX_ARCH}-${TERMUX_PKG_API_LEVEL}"
# Bump the below version if a change is made in toolchain setup to ensure
# that everyone gets an updated toolchain:
TERMUX_STANDALONE_TOOLCHAIN+="-v2"
TERMUX_STANDALONE_TOOLCHAIN+="-v3"
if [ -n "${TERMUX_PKG_BLACKLISTED_ARCHES:=""}" ] && [ "$TERMUX_PKG_BLACKLISTED_ARCHES" != "${TERMUX_PKG_BLACKLISTED_ARCHES/$TERMUX_ARCH/}" ]; then
echo "Skipping building $TERMUX_PKG_NAME for arch $TERMUX_ARCH"