160d3aeb06
* update ndk to 17 * bump NDK version in setup-android script * libnl: fix for ndk r17 * libpixman: use clang's __builtin_shufflevector instead of __builtin_shuffle (#1) Required to make package build with ndk17. * fix as for arm * ndk17 still uses ld.bfd on aarch64 * use -fno-integrated-as for clang only * glib: remove patch unnecessary after ndk17 * torsocks: remove unneeded patch after ndk17 * subversion: fix build as clang++ now errors out for mismatched flags * libpulseaudio: fix build with ndk17 https://github.com/termux/termux-packages/pull/2415#issuecomment-388296684 * gst-plugins-good: disable video4linux2 ioctl is defined as __overloadable in ndk17 headers which conflicts with v4l2object's member ioctl * libzmq: disable Werror to build with ndk17 * ltrace: hardcode symbol not available in ndk17 * busybox: build with clang for all arches except arm * dropbear: build with clang instead of gcc * gnupg: build with clang instead of gcc * openssl: use clang for all arches except arm * picolisp: build with clang instead of gcc * valgrind: use clang on all arches except aarch64 * Revert "gst-plugins-good: disable video4linux2" This reverts commit 43850b81ccf60033c25cb13dfd326c1b0528773a. Already applied on base branch. * libllvm: use default arm triple
28 lines
1.0 KiB
Diff
28 lines
1.0 KiB
Diff
diff -u -r /home/fornwall/lib/android-ndk/sysroot/usr/include/paths.h ./usr/include/paths.h
|
|
--- /home/fornwall/lib/android-ndk/sysroot/usr/include/paths.h 2017-11-09 09:57:12.000000000 +0100
|
|
+++ ./usr/include/paths.h 2017-11-15 11:51:24.456129565 +0100
|
|
@@ -34,15 +34,19 @@
|
|
|
|
#include <sys/cdefs.h>
|
|
|
|
-#ifndef _PATH_BSHELL
|
|
-#define _PATH_BSHELL "/system/bin/sh"
|
|
-#endif
|
|
+#define _PATH_BSHELL "@TERMUX_PREFIX@/bin/sh"
|
|
#define _PATH_CONSOLE "/dev/console"
|
|
-#define _PATH_DEFPATH "/sbin:/system/sbin:/system/bin:/system/xbin:/odm/bin:/vendor/bin:/vendor/xbin"
|
|
+#define _PATH_DEFPATH "@TERMUX_PREFIX@/bin:@TERMUX_PREFIX@/bin/applets"
|
|
#define _PATH_DEV "/dev/"
|
|
#define _PATH_DEVNULL "/dev/null"
|
|
#define _PATH_KLOG "/proc/kmsg"
|
|
#define _PATH_MOUNTED "/proc/mounts"
|
|
#define _PATH_TTY "/dev/tty"
|
|
|
|
+#define _PATH_STDPATH _PATH_DEFPATH
|
|
+#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_ */
|