From 1f8481e3637cc2d7459f0fe55e29f7a6fc6f3d59 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Mon, 10 Jul 2017 09:52:50 +0200 Subject: [PATCH] ndk-patches: Fix malformed patch --- build-package.sh | 2 +- ndk-patches/utmp.h.patch | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build-package.sh b/build-package.sh index f160ab926..2dd20085a 100755 --- a/build-package.sh +++ b/build-package.sh @@ -446,7 +446,7 @@ termux_step_setup_toolchain() { 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+="-v7" + TERMUX_STANDALONE_TOOLCHAIN+="-v8" # We put this after system PATH to avoid picking up toolchain stripped python export PATH=$PATH:$TERMUX_STANDALONE_TOOLCHAIN/bin diff --git a/ndk-patches/utmp.h.patch b/ndk-patches/utmp.h.patch index 60e6ab374..3c335e724 100644 --- a/ndk-patches/utmp.h.patch +++ b/ndk-patches/utmp.h.patch @@ -2,17 +2,17 @@ In Termux login_tty() is implemented in the libutil package to support android-2 diff -u -r /home/fornwall/lib/android-ndk/sysroot/usr/include/utmp.h ./usr/include/utmp.h --- /home/fornwall/lib/android-ndk/sysroot/usr/include/utmp.h 2017-06-20 17:41:56.000000000 +0200 -+++ ./usr/include/utmp.h 2017-07-02 11:42:29.724986159 +0200 -@@ -102,11 +102,6 @@ ++++ ./usr/include/utmp.h 2017-07-10 09:47:42.422659110 +0200 +@@ -101,11 +101,7 @@ + struct utmp* getutent(void); void endutent(void); - +- -#if __ANDROID_API__ >= 23 -int login_tty(int) __INTRODUCED_IN(23); -#endif /* __ANDROID_API__ >= 23 */ - -- --__END_DECLS +int login_tty(int); - #endif /* _UTMP_H_ */ + __END_DECLS +