From b461954b5cf136480ffed25efca1a6f8e2a39cf1 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sun, 17 Sep 2017 20:51:35 +0200 Subject: [PATCH] ndk-patches: Fix pwd.h patch --- build-package.sh | 2 +- ndk-patches/pwd.h.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-package.sh b/build-package.sh index b02d1e64..36b3a563 100755 --- a/build-package.sh +++ b/build-package.sh @@ -365,7 +365,7 @@ termux_step_start_build() { TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_TOPDIR/_lib/${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+="-v13" + TERMUX_STANDALONE_TOOLCHAIN+="-v14" 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" diff --git a/ndk-patches/pwd.h.patch b/ndk-patches/pwd.h.patch index 5575a19d..7fc34ee4 100644 --- a/ndk-patches/pwd.h.patch +++ b/ndk-patches/pwd.h.patch @@ -20,7 +20,7 @@ diff -u -r /home/fornwall/lib/android-ndk/sysroot/usr/include/pwd.h ./usr/includ + if (result == NULL || access(result, /*X_OK*/1) == -1) { + pw->pw_shell = "@TERMUX_PREFIX@/bin/bash"; + } else { -+ pw->pw_shell = result; ++ pw->pw_shell = (char*) result; + } + pw->pw_dir = "@TERMUX_HOME@"; + pw->pw_passwd = "*"; -- 2.11.0