X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/5e385c6adf09590551bfb206a5df926026da8b26..d258ef0cea1373f68782802509422c86bca58fd5:/ndk_patches/paths.h.patch diff --git a/ndk_patches/paths.h.patch b/ndk_patches/paths.h.patch index 93cb2fa1..d85d507b 100644 --- a/ndk_patches/paths.h.patch +++ b/ndk_patches/paths.h.patch @@ -1,6 +1,30 @@ -diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/include/paths.h ./usr/include/paths.h ---- /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/include/paths.h 2016-03-03 16:54:24.000000000 -0500 -+++ ./usr/include/paths.h 2016-04-11 03:56:22.460545708 -0400 +--- /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm64/usr/include/paths.h 2016-10-09 16:37:54.394746195 +0530 ++++ ./usr/include/paths.h 2016-10-21 23:28:38.689411903 +0530 +@@ -33,12 +33,12 @@ + #define _PATHS_H_ + + /* Default search path. */ +-#define _PATH_DEFPATH "/usr/bin:/bin" ++#define _PATH_DEFPATH "@TERMUX_PREFIX@/bin:@TERMUX_PREFIX@/bin/applets" + /* All standard utilities path. */ + #define _PATH_STDPATH \ +- "/usr/bin:/bin:/usr/sbin:/sbin" ++ _PATH_DEFPATH + +-#define _PATH_BSHELL "/system/bin/sh" ++#define _PATH_BSHELL "@TERMUX_PREFIX@/bin/sh" + #define _PATH_CONSOLE "/dev/console" + #define _PATH_CSHELL "/bin/csh" + #define _PATH_DEVDB "/var/run/dev.db" +@@ -51,7 +51,7 @@ + #define _PATH_MAN "/usr/share/man" + #define _PATH_MEM "/dev/mem" + #define _PATH_MNTTAB "/etc/fstab" +-#define _PATH_MOUNTED "/etc/mtab" ++#define _PATH_MOUNTED "/proc/mounts" + #define _PATH_NOLOGIN "/etc/nologin" + #define _PATH_PRESERVE "/var/lib" + #define _PATH_RWHODIR "/var/spool/rwho" @@ -66,9 +66,9 @@ /* Provide trailing slash, since mostly used for building pathnames. */