c3c36e92a5
Using /system/bin/sh does not work in all cases due to LD_LIBRARY_PATH, so patch paths.h to define _PATH_BSHELL to our own shell $PREFIX/bin/sh.
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm64/usr/include/paths.h ./usr/include/paths.h
|
|
--- /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm64/usr/include/paths.h 2016-03-03 16:54:24.000000000 -0500
|
|
+++ ./usr/include/paths.h 2016-05-30 17:18:24.726803678 -0400
|
|
@@ -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"
|
|
@@ -66,9 +66,9 @@
|
|
|
|
/* Provide trailing slash, since mostly used for building pathnames. */
|
|
#define _PATH_DEV "/dev/"
|
|
-#define _PATH_TMP "/tmp/"
|
|
-#define _PATH_VARDB "/var/db/"
|
|
-#define _PATH_VARRUN "/var/run/"
|
|
-#define _PATH_VARTMP "/var/tmp/"
|
|
+#define _PATH_TMP "@TERMUX_PREFIX@/tmp/"
|
|
+#define _PATH_VARDB "@TERMUX_PREFIX@/var/db/"
|
|
+#define _PATH_VARRUN "@TERMUX_PREFIX@/var/run/"
|
|
+#define _PATH_VARTMP "@TERMUX_PREFIX@/var/tmp/"
|
|
|
|
#endif /* !_PATHS_H_ */
|