这是indexloc提供的服务，不要输入任何密码
Skip to content

fix(main/pypy3): fix build with NDK r28c #25675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 12, 2025
Merged

fix(main/pypy3): fix build with NDK r28c #25675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c7fc74b
chore(main/pypy3-{tkinter,tests}): refactor `$TERMUX_PACKAGE_FORMAT` …
robertkirkman Jul 28, 2025
58216a2
fix(main/pypy3): clean up runtime-generated files from previously-ins…
robertkirkman Jul 28, 2025
a95d9b1
chore(main/pypy3): remove the instance of `-Wno-discarded-qualifiers`…
robertkirkman Aug 11, 2025
5b6e1da
fix(main/pypy3): fix build with NDK r28c
robertkirkman Aug 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions packages/pypy3/0012-do-not-use-wno-discarded-qualifiers.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Prevents the repetitive warning
warning: unknown warning option '-Wno-discarded-qualifiers'
from filling the build log and impacting readability.

--- a/rpython/translator/platform/linux.py
+++ b/rpython/translator/platform/linux.py
@@ -15,7 +15,6 @@ class Linux(BasePosix):
cflags = tuple(
['-O3', '-pthread', '-fomit-frame-pointer',
'-Wall', '-Wno-unused', '-Wno-address',
- '-Wno-discarded-qualifiers', # RPyField does not know about const
# The parser turns 'const char *const *includes' into 'const const char **includes'
'-Wno-duplicate-decl-specifier',
# These make older gcc behave like gcc-14
15 changes: 14 additions & 1 deletion packages/pypy3/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@licy183"
_MAJOR_VERSION=3.11
TERMUX_PKG_VERSION=7.3.19
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://downloads.python.org/pypy/pypy$_MAJOR_VERSION-v$TERMUX_PKG_VERSION-src.tar.bz2
TERMUX_PKG_SHA256=4817c044bb469a3274e60aa3645770f81eb4f9166ea7fdc4e6c351345554c8d8
TERMUX_PKG_DEPENDS="gdbm, libandroid-posix-semaphore, libandroid-support, libbz2, libcrypt, libexpat, libffi, liblzma, libsqlite, ncurses, ncurses-ui-libs, openssl, zlib"
Expand Down Expand Up @@ -38,6 +39,7 @@ termux_step_post_get_source() {
| patch --silent -p1

sed -e "s|@TERMUX_PREFIX@|${TERMUX_PREFIX}|g" \
-e "s|@TERMUX_PKG_API_LEVEL@|${TERMUX_PKG_API_LEVEL}|g" \
"$TERMUX_PKG_BUILDER_DIR"/termux.py.in > \
"$TERMUX_PKG_SRCDIR"/rpython/translator/platform/termux.py
}
Expand Down Expand Up @@ -318,6 +320,17 @@ termux_step_make_install() {
}

termux_step_create_debscripts() {
# postinst script to clean up runtime-generated files of previous pypy3 versions that
# do not match the current $_MAJOR_VERSION
# (this one needs to have bash in the shebang, not sh, because of the use of a
# wildcard feature that does not work if the shebang is sh)
cat <<- POSTINST_EOF > ./postinst
#!$TERMUX_PREFIX/bin/bash
echo "Deleting files from other versions of $TERMUX_PKG_NAME..."
rm -Rf $TERMUX_PREFIX/opt/$TERMUX_PKG_NAME/lib/pypy*[^$_MAJOR_VERSION]
exit 0
POSTINST_EOF

# Pre-rm script to cleanup runtime-generated files.
cat <<- PRERM_EOF > ./prerm
#!$TERMUX_PREFIX/bin/sh
Expand All @@ -335,5 +348,5 @@ termux_step_create_debscripts() {
exit 0
PRERM_EOF

chmod 0755 prerm
chmod 0755 postinst prerm
}
2 changes: 1 addition & 1 deletion packages/pypy3/pypy3-tests.subpackage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ termux_step_create_subpkg_debscripts() {
cat <<- PRERM_EOF > ./prerm
#!$TERMUX_PREFIX/bin/sh

if [ "$TERMUX_PACKAGE_FORMAT" != "pacman" ] && [ "\$1" != "remove" ]; then
if [ "$TERMUX_PACKAGE_FORMAT" = "debian" ] && [ "\$1" != "remove" ]; then
exit 0
fi

Expand Down
2 changes: 1 addition & 1 deletion packages/pypy3/pypy3-tkinter.subpackage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ termux_step_create_subpkg_debscripts() {
cat <<- PRERM_EOF > ./prerm
#!$TERMUX_PREFIX/bin/sh

if [ "$TERMUX_PACKAGE_FORMAT" != "pacman" ] && [ "\$1" != "remove" ]; then
if [ "$TERMUX_PACKAGE_FORMAT" = "debian" ] && [ "\$1" != "remove" ]; then
exit 0
fi

Expand Down
5 changes: 4 additions & 1 deletion packages/pypy3/termux.py.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,11 @@ class BaseTermux(Linux):
def get_multiarch(self):
raise NotImplementedError("Needs to be overwritten")

def get_api_level(self):
return "@TERMUX_PKG_API_LEVEL@"

def _get_cross_compiler(self):
return "clang" if self._is_same_platform_type() else ("clang --target=" + self.get_multiarch())
return "clang" if self._is_same_platform_type() else ("clang --target=" + self.get_multiarch() + self.get_api_level())

def _get_build_platform_type(self):
return "x86"
Expand Down