From bc8227d2bda7124c354bb9b618c5feea0dc60db7 Mon Sep 17 00:00:00 2001 From: RainbowC0 <67918391+RainbowC0@users.noreply.github.com> Date: Sun, 5 Feb 2023 18:11:29 +0800 Subject: Changes for Alpine (#508) * Update CMakeLists.txt Replaced bash with sh so that it can be compiled on Alpine * Update elfloader.c * Update threads.c Replaced __clock_id with clock_id to adapted to Alpine. --- CMakeLists.txt | 4 ++-- src/elfs/elfloader.c | 3 +++ src/libtools/threads.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 607183cc..b03fdf13 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -588,13 +588,13 @@ endif() if(DYNAREC) add_custom_command( OUTPUT "${BOX64_ROOT}/src/git_head.h" - COMMAND bash -c "echo \\\#define GITREV \\\"$(git rev-parse --short HEAD)\\\">\"${BOX64_ROOT}/src/git_head.h\"" + COMMAND sh -c "echo \\\#define GITREV \\\"$(git rev-parse --short HEAD)\\\">\"${BOX64_ROOT}/src/git_head.h\"" DEPENDS dynarec ${ELFLOADER_SRC} ${WRAPPEDS} VERBATIM) else() add_custom_command( OUTPUT "${BOX64_ROOT}/src/git_head.h" - COMMAND bash -c "echo \\\#define GITREV \\\"$(git rev-parse --short HEAD)\\\">\"${BOX64_ROOT}/src/git_head.h\"" + COMMAND sh -c "echo \\\#define GITREV \\\"$(git rev-parse --short HEAD)\\\">\"${BOX64_ROOT}/src/git_head.h\"" DEPENDS ${ELFLOADER_SRC} ${WRAPPEDS} VERBATIM) endif() diff --git a/src/elfs/elfloader.c b/src/elfs/elfloader.c index 94c5a93e..69c7797d 100755 --- a/src/elfs/elfloader.c +++ b/src/elfs/elfloader.c @@ -10,6 +10,9 @@ #include #include #include +#ifndef _DLFCN_H +#include +#endif #include "custommem.h" #include "box64version.h" diff --git a/src/libtools/threads.c b/src/libtools/threads.c index d1131363..7e70b160 100755 --- a/src/libtools/threads.c +++ b/src/libtools/threads.c @@ -726,7 +726,7 @@ EXPORT int my_pthread_cond_wait(x64emu_t* emu, pthread_cond_t* cond, void* mutex updateAlignedMutex(mutex, real); return ret; } -EXPORT int my_pthread_cond_clockwait(x64emu_t *emu, pthread_cond_t* cond, void* mutex, __clockid_t __clock_id, const struct timespec* __abstime) +EXPORT int my_pthread_cond_clockwait(x64emu_t *emu, pthread_cond_t* cond, void* mutex, clockid_t __clock_id, const struct timespec* __abstime) { (void)emu; int ret; -- cgit 1.4.1