Add Package: libandroid-posix-semaphore #8993

licy183 · 2022-02-10T10:45:18Z

Bionic libc doesn't support sem_open, sem_close and sem_unlink. This package contains a port of posix named semaphore from musl libc. The mapped file will be created at the temp directory of termux (/data/data/com.termux/files/usr/tmp) rather than tmpfs (/dev/shm).

It provides the NDK <semaphore.h> header. So this commit will update the ndk-sysroot package and termux NDK toolchain. Hope that removing <semaphore.h> header from NDK will not cause the compilation failure of many packages.

See also: #8990

truboxl · 2022-02-10T13:42:28Z

packages/libandroid-posix-semaphore/semaphore.c

+        errno = ENAMETOOLONG;
+        return 0;
+    }
+    memcpy(buf, "/data/data/com.termux/files/usr/tmp/sem.", 40);


Can we avoid hardcode prefix? Preferably use @TERMUX_PREFIX@

This is a C source file, not a patch. Seems the shortcut @TERMUX_PREFIX@ can only work on a .patch file.

For non-patch files, we have to sed manually to substitute @TERMUX_PREFIX@:

termux-packages/packages/liblua54/build.sh

Lines 15 to 17 in e1a6c93

sed -e "s/%VER%/${TERMUX_PKG_VERSION%.*}/g;s/%REL%/${TERMUX_PKG_VERSION}/g" \

-e "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|" \

"$TERMUX_PKG_BUILDER_DIR"/lua.pc.in > lua.pc

This is preferable, but not mandatory I suppose. We have another instance where $TERMUX_PREFIX is hardcoded:

termux-packages/packages/libandroid-wordexp/wordexp.c

Line 121 in e1a6c93

execl("/data/data/com.termux/files/usr/bin/sh", "sh", "-c",

Checking on wordexp.c seems like xeffyr was fine with full prefix. Guess this is a go then.

It is preferable avoid hardcoding it, sed'ing it would be better

finagolfin · 2022-02-11T05:43:38Z

scripts/build/termux_step_setup_toolchain.sh

 	# Remove <spawn.h> as it's only for future (later than android-27).
 	# Remove <zlib.h> and <zconf.h> as we build our own zlib.
 	# Remove unicode headers provided by libicu.
-	rm usr/include/{sys/{capability,shm,sem},{glob,iconv,spawn,zlib,zconf}}.h
+	rm usr/include/{sys/{capability,shm,sem},{glob,iconv,semaphore,spawn,zlib,zconf}}.h


Are we sure moving this to a separate package won't break building any other packages, or are we going to shift all those packages to listing this one as a dependency eventually? @Grimler91, you may want to chime in.

Can do some test builds and see if anything, or how much, that brakes. Probably more packages need lobandroid-posix-semaphore as dependency

Maybe we can add this patch into libandroid-support package rather than split into a sperated package. It would not break other package's dependency.

Grimler91 · 2022-02-11T07:24:04Z

All/most c++ packages fail with something like

In file included from /home/builder/.termux-build/aspell/src/common/string.hpp:13:
In file included from /home/builder/.termux-build/_cache/android-r23b-api-24-v7/bin/../sysroot/usr/include/c++/v1/algorithm:643:
In file included from /home/builder/.termux-build/_cache/android-r23b-api-24-v7/bin/../sysroot/usr/include/c++/v1/memory:673:
In file included from /home/builder/.termux-build/_cache/android-r23b-api-24-v7/bin/../sysroot/usr/include/c++/v1/atomic:550:
/home/builder/.termux-build/_cache/android-r23b-api-24-v7/bin/../sysroot/usr/include/c++/v1/__threading_support:33:11: fatal error: 'semaphore.h' file not found
# include <semaphore.h>
          ^~~~~~~~~~~~~

So the header file should probably be made available always. We could either replace the ndk sysroot header with the one from this package or split it into a libandroid-posix-semaphore-dev package and make the build system always install that one

licy183 · 2022-02-11T07:36:53Z

We could either replace the ndk sysroot header with the one from this package or split it into a libandroid-posix-semaphore-dev package and make the build system always install that one

Actually the <semaphore.h> header from this package is copied from ndk sysroot without any modification.

Maybe we can add these sem_* implementations into libandroid-support package rather than split into a sperate package. If some package need to use posix named semaphore, just add libandroid-support as dependency because libandroid-support is explicitly linked.

Grimler91 · 2022-02-11T08:51:29Z

Actually the <semaphore.h> header from this package is copied from ndk sysroot without any modification.

Oh, yes, let's keep it in the ndk/ndk-sysroot in that case. Some packages fail to build even if the header is present in $PREFIX/include (since there is no guarantee -I$PREFIX/include is passed to compiler). I think we can keep it as a libandroid-posix-semaphore package, and add it as dependency to the packages that make use of it. Header should go into ndk-sysroot as before then though

licy183 · 2022-02-11T09:19:36Z

Oh, yes, let's keep it in the ndk/ndk-sysroot in that case. Some packages fail to build even if the header is present in $PREFIX/include (since there is no guarantee -I$PREFIX/include is passed to compiler). I think we can keep it as a libandroid-posix-semaphore package, and add it as dependency to the packages that make use of it. Header should go into ndk-sysroot as before then though

OK. I will submit a commit.

Grimler91 · 2022-02-11T10:20:39Z

Thanks! Semaphore header could probably be moved from ndk-sysroot to libandroid-posix-semaphore to simplify on device builds, but that's something we can fix later.

I added a commit to pass PREFIX as compiler flag instead, to avoid it always being hardcoded

licy183 requested review from Grimler91, finagolfin and landfillbaby as code owners February 10, 2022 10:45

truboxl reviewed Feb 10, 2022

View reviewed changes

xtkoba approved these changes Feb 11, 2022

View reviewed changes

finagolfin reviewed Feb 11, 2022

View reviewed changes

licy183 and others added 2 commits February 11, 2022 11:21

Add Package: libandroid-posix-semaphore

b26410d

libandroid-posix-semaphore: pass PREFIX as compiler flag

a67899c

Grimler91 merged commit a67899c into termux:master Feb 11, 2022

licy183 deleted the posix-sem branch February 11, 2022 10:54

licy183 mentioned this pull request Feb 11, 2022

Fix (python) : Add support for multiprocessing module #8990

Merged

finagolfin mentioned this pull request Feb 13, 2022

[android] Fix some tests and a doc flag swiftlang/swift#40977

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Package: libandroid-posix-semaphore #8993

Add Package: libandroid-posix-semaphore #8993

licy183 commented Feb 10, 2022

truboxl Feb 10, 2022

licy183 Feb 10, 2022

xtkoba Feb 11, 2022

truboxl Feb 11, 2022

Grimler91 Feb 11, 2022

finagolfin Feb 11, 2022

Grimler91 Feb 11, 2022 •

edited

Loading

licy183 Feb 11, 2022

Grimler91 commented Feb 11, 2022

licy183 commented Feb 11, 2022

Grimler91 commented Feb 11, 2022

licy183 commented Feb 11, 2022

Grimler91 commented Feb 11, 2022

	sed -e "s/%VER%/${TERMUX_PKG_VERSION%.*}/g;s/%REL%/${TERMUX_PKG_VERSION}/g" \
	-e "s\|@TERMUX_PREFIX@\|$TERMUX_PREFIX\|" \
	"$TERMUX_PKG_BUILDER_DIR"/lua.pc.in > lua.pc

Add Package: libandroid-posix-semaphore #8993

Add Package: libandroid-posix-semaphore #8993

Conversation

licy183 commented Feb 10, 2022

truboxl Feb 10, 2022

Choose a reason for hiding this comment

licy183 Feb 10, 2022

Choose a reason for hiding this comment

xtkoba Feb 11, 2022

Choose a reason for hiding this comment

truboxl Feb 11, 2022

Choose a reason for hiding this comment

Grimler91 Feb 11, 2022

Choose a reason for hiding this comment

finagolfin Feb 11, 2022

Choose a reason for hiding this comment

Grimler91 Feb 11, 2022 • edited Loading

Choose a reason for hiding this comment

licy183 Feb 11, 2022

Choose a reason for hiding this comment

Grimler91 commented Feb 11, 2022

licy183 commented Feb 11, 2022

Grimler91 commented Feb 11, 2022

licy183 commented Feb 11, 2022

Grimler91 commented Feb 11, 2022

Grimler91 Feb 11, 2022 •

edited

Loading