From a67899c977954fd743e5484ec127b4e2dceca9e1 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 11 Feb 2022 11:15:02 +0100 Subject: [PATCH] libandroid-posix-semaphore: pass PREFIX as compiler flag --- packages/libandroid-posix-semaphore/build.sh | 3 ++- packages/libandroid-posix-semaphore/semaphore.c | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/libandroid-posix-semaphore/build.sh b/packages/libandroid-posix-semaphore/build.sh index 17c8f7592..9cf466510 100644 --- a/packages/libandroid-posix-semaphore/build.sh +++ b/packages/libandroid-posix-semaphore/build.sh @@ -7,7 +7,8 @@ TERMUX_PKG_SKIP_SRC_EXTRACT=true TERMUX_PKG_BUILD_IN_SRC=true termux_step_make() { - $CC $CFLAGS $CPPFLAGS -I$TERMUX_PKG_BUILDER_DIR -c $TERMUX_PKG_BUILDER_DIR/semaphore.c + $CC $CFLAGS $CPPFLAGS -DPREFIX="\"$TERMUX_PREFIX\"" \ + -c $TERMUX_PKG_BUILDER_DIR/semaphore.c $CC $LDFLAGS -shared semaphore.o -o libandroid-posix-semaphore.so $AR rcu libandroid-posix-semaphore.a semaphore.o cp -f $TERMUX_PKG_BUILDER_DIR/LICENSE $TERMUX_PKG_SRCDIR/ diff --git a/packages/libandroid-posix-semaphore/semaphore.c b/packages/libandroid-posix-semaphore/semaphore.c index c0d4a6372..3e41c40c7 100644 --- a/packages/libandroid-posix-semaphore/semaphore.c +++ b/packages/libandroid-posix-semaphore/semaphore.c @@ -43,6 +43,10 @@ #define SEM_NSEMS_MAX 256 #endif // !SEM_NSEMS_MAX +#ifndef PREFIX +#define PREFIX "/data/data/com.termux/files/usr" +#endif + static __inline__ char *__strchrnul(const char *s, int c) { c = (unsigned char)c; @@ -78,7 +82,7 @@ static char *__sem_mapname(const char *name, char *buf) errno = ENAMETOOLONG; return 0; } - memcpy(buf, "/data/data/com.termux/files/usr/tmp/sem.", 40); + memcpy(buf, PREFIX"/tmp/sem.", 40); memcpy(buf+40, name, p-name+1); return buf; }