Skip to content
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

Jump to bottom

toolchain: add API guard for timezone_t #21120

Merged
merged 2 commits into from
Aug 20, 2024
Merged

toolchain: add API guard for timezone_t #21120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24533e3
toolchain: add API guard for `timezone_t`
licy183 Aug 14, 2024
0e7a7c3
coreutils: revbump to rebuild
licy183 Aug 14, 2024
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
18 changes: 18 additions & 0 deletions ndk-patches/27/time.h.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
--- a/usr/include/time.h
+++ b/usr/include/time.h
@@ -39,6 +39,7 @@

__BEGIN_DECLS

+#if __ANDROID_API__ >= 35
/* If we just use void* in the typedef, the compiler exposes that in error messages. */
struct __timezone_t;

@@ -50,6 +51,7 @@
* to remove the pointer.
*/
typedef struct __timezone_t* timezone_t;
+#endif

/** Divisor to compute seconds from the result of a call to clock(). */
#define CLOCKS_PER_SEC 1000000
1 change: 1 addition & 0 deletions packages/coreutils/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Basic file, shell and text manipulation utilities from t
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=9.5
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/coreutils/coreutils-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=cd328edeac92f6a665de9f323c93b712af1858bc2e0d88f3f7100469470a1b8a
TERMUX_PKG_DEPENDS="libandroid-support, libgmp, libiconv"
Expand Down
2 changes: 1 addition & 1 deletion scripts/build/termux_step_setup_toolchain.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ termux_step_setup_toolchain() {
# toolchain setup to ensure that everyone gets an updated
# toolchain
if [ "${TERMUX_NDK_VERSION}" = "27" ]; then
TERMUX_STANDALONE_TOOLCHAIN+="-v0"
TERMUX_STANDALONE_TOOLCHAIN+="-v1"
termux_setup_toolchain_27
elif [ "${TERMUX_NDK_VERSION}" = 23c ]; then
TERMUX_STANDALONE_TOOLCHAIN+="-v8"
Expand Down