From 61b7993f0528af4c871b5ae3aaf32d7831e30625 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 29 Jul 2019 23:20:55 +0800 Subject: improve to compile support for termux/android --- core/src/tbox/inc/linux/tbox.config.h | 18 +++++++++++++++--- core/src/tbox/tbox | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/core/src/tbox/inc/linux/tbox.config.h b/core/src/tbox/inc/linux/tbox.config.h index 6e801af8e..43fe30cf9 100755 --- a/core/src/tbox/inc/linux/tbox.config.h +++ b/core/src/tbox/inc/linux/tbox.config.h @@ -88,7 +88,11 @@ #define TB_CONFIG_LIBC_HAVE_SETJMP 1 #define TB_CONFIG_LIBC_HAVE_SIGSETJMP 1 #define TB_CONFIG_LIBC_HAVE_KILL 1 -/*#define TB_CONFIG_LIBC_HAVE_BACKTRACE 0*/ +#if defined(__ANDROID__) +/* #undef TB_CONFIG_LIBC_HAVE_BACKTRACE */ +#else +# define TB_CONFIG_LIBC_HAVE_BACKTRACE 1 +#endif #define TB_CONFIG_LIBC_HAVE_SETLOCALE 1 #define TB_CONFIG_LIBC_HAVE_FPUTC 1 #define TB_CONFIG_LIBC_HAVE_FGETC 1 @@ -137,7 +141,11 @@ #define TB_CONFIG_POSIX_HAVE_PTHREAD_GETSPECIFIC 1 #define TB_CONFIG_POSIX_HAVE_PTHREAD_KEY_CREATE 1 #define TB_CONFIG_POSIX_HAVE_PTHREAD_KEY_DELETE 1 -/*#define TB_CONFIG_POSIX_HAVE_PTHREAD_SETAFFINITY_NP 0*/ +#if defined(__ANDROID__) +/* #undef TB_CONFIG_POSIX_HAVE_PTHREAD_SETAFFINITY_NP */ +#else +# define TB_CONFIG_POSIX_HAVE_PTHREAD_SETAFFINITY_NP 1 +#endif #define TB_CONFIG_POSIX_HAVE_SOCKET 1 #define TB_CONFIG_POSIX_HAVE_POLL 1 #define TB_CONFIG_POSIX_HAVE_OPENDIR 1 @@ -164,7 +172,11 @@ #define TB_CONFIG_POSIX_HAVE_SENDFILE 1 #define TB_CONFIG_POSIX_HAVE_EPOLL_CREATE 1 #define TB_CONFIG_POSIX_HAVE_EPOLL_WAIT 1 -#define TB_CONFIG_POSIX_HAVE_POSIX_SPAWNP 1 +#if defined(__ANDROID__) +/* #undef TB_CONFIG_POSIX_HAVE_POSIX_SPAWNP */ +#else +# define TB_CONFIG_POSIX_HAVE_POSIX_SPAWNP 1 +#endif #define TB_CONFIG_POSIX_HAVE_EXECVP 1 #define TB_CONFIG_POSIX_HAVE_EXECVPE 1 #define TB_CONFIG_POSIX_HAVE_FORK 1 diff --git a/core/src/tbox/tbox b/core/src/tbox/tbox index 4ac60edcc..3d0518b8a 160000 --- a/core/src/tbox/tbox +++ b/core/src/tbox/tbox @@ -1 +1 @@ -Subproject commit 4ac60edcc97c37b41f08f9c67adfe52c32c25671 +Subproject commit 3d0518b8a1083bae849221a97025e33dc90bb9bb -- cgit v1.3.1