diff options
| -rw-r--r-- | compat/android28.h | 22 | ||||
| -rw-r--r-- | lib/meson.build | 2 | ||||
| -rw-r--r-- | meson/android28-aarch64 | 21 |
3 files changed, 44 insertions, 1 deletions
diff --git a/compat/android28.h b/compat/android28.h new file mode 100644 index 0000000..9ace496 --- /dev/null +++ b/compat/android28.h @@ -0,0 +1,22 @@ +#pragma once +#include <pthread.h> + +#if defined(__BIONIC__) +#ifndef PTHREAD_CANCEL_ENABLE +#define PTHREAD_CANCEL_ENABLE 0 +#endif +#ifndef PTHREAD_CANCEL_DISABLE +#define PTHREAD_CANCEL_DISABLE 0 +#endif + +static inline int pthread_setcancelstate(int state, int *oldstate) { + if (oldstate) *oldstate = state; + return 0; +} + +static inline int pthread_cancel(pthread_t t) { + (void)t; + return 0; +} +#endif + diff --git a/lib/meson.build b/lib/meson.build index 6a52d06..0b9a67c 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -29,7 +29,7 @@ if host_machine.system().startswith('netbsd') cc.find_library('puffs') ] else # Required for clock_gettime before glibc 2.17 - deps += cc.find_library('rt') + deps += cc.find_library('rt', required: false) endif fusermount_path = join_paths(get_option('prefix'), get_option('bindir')) diff --git a/meson/android28-aarch64 b/meson/android28-aarch64 new file mode 100644 index 0000000..bbf4343 --- /dev/null +++ b/meson/android28-aarch64 @@ -0,0 +1,21 @@ +[binaries] +c = '/opt/android-ndk/android-ndk-r27d/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android28-clang' +cpp = '/opt/android-ndk/android-ndk-r27d/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android28-clang++' +ar = '/opt/android-ndk/android-ndk-r27d/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar' +strip = '/opt/android-ndk/android-ndk-r27d/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip' +pkg-config = 'pkg-config' + +[host_machine] +system = 'linux' +cpu_family = 'aarch64' +cpu = 'aarch64' +endian = 'little' + +[properties] +sys_root = '/opt/android-ndk/android-ndk-r27d/toolchains/llvm/prebuilt/linux-x86_64/sysroot' + +[built-in options] +c_args = ['-D_GNU_SOURCE','-D__ANDROID__','-D_FILE_OFFSET_BITS=64','--sysroot=/opt/android-ndk/android-ndk-r27d/toolchains/llvm/prebuilt/linux-x86_64/sysroot','-include','/home/lk/.local/src/fuse/compat/android28.h'] +cpp_args = ['-D_GNU_SOURCE','-D__ANDROID__','-D_FILE_OFFSET_BITS=64','--sysroot=/opt/android-ndk/android-ndk-r27d/toolchains/llvm/prebuilt/linux-x86_64/sysroot','-include','/home/lk/.local/src/fuse/compat/android28.h'] +c_link_args = ['--sysroot=/opt/android-ndk/android-ndk-r27d/toolchains/llvm/prebuilt/linux-x86_64/sysroot'] +cpp_link_args = ['--sysroot=/opt/android-ndk/android-ndk-r27d/toolchains/llvm/prebuilt/linux-x86_64/sysroot'] |