mirror of
https://github.com/termux/termux-packages.git
synced 2025-09-18 13:39:39 +00:00
036d4ea4d3
- Fixes https://github.com/termux/termux-packages/issues/26325 - Upstream fish, it appears through the heavy patching we increasingly need to do, does not officially support Android. This means that it is completely understandable that they continue to make changes that break the Android build, and these are not necessarily bugs on their end because they don't build or test for Android, and already work a lot to support all non-Android platforms. Therefore, sometimes the only viable option we might have is to revert or partially revert some commits which are problematic for Android support, in the downstream. Commits being reverted in this PR: -d68f8bdd3b- partially reverted to avoid error `error: call to undeclared function 'UNUSED'` -6644cc9b0e- reverted to avoid error `expected fn pointer`...`*const i8`...`found fn item`...`*const u8` Commits that I am aware are in the development branch of fish that are not yet present in this fish stable release, but which I believe are highly likely to cause errors in a future release and will most likely also need to be reverted in order to build that future release for Android: -70bd49f612
22 lines
859 B
Diff
22 lines
859 B
Diff
Partially reverts https://github.com/fish-shell/fish-shell/commit/d68f8bdd3b60a4a4cee0c938b5b3e2ff23c1ed86
|
|
(https://github.com/fish-shell/fish-shell/commit/7228cb15bfacfc88f97a1733a8e55b0ae78ec53c)
|
|
In order to work around "error: call to undeclared function 'UNUSED'"
|
|
|
|
This topic is closely related to this other commit,
|
|
https://github.com/fish-shell/fish-shell/commit/70bd49f61265c3a50c98d439fc77e13ef4409231
|
|
which is not yet present in stable fish (4.0.6 at time of writing),
|
|
but which will probably also break the build of fish for Android in the future and need to be
|
|
reverted or partially reverted.
|
|
|
|
--- a/src/libc.c
|
|
+++ b/src/libc.c
|
|
@@ -9,6 +9,8 @@
|
|
#include <sys/statvfs.h> // ST_LOCAL
|
|
#include <unistd.h> // _CS_PATH, _PC_CASE_SENSITIVE
|
|
|
|
+#define UNUSED(x) (void)(x)
|
|
+
|
|
size_t C_MB_CUR_MAX() { return MB_CUR_MAX; }
|
|
|
|
uint64_t C_ST_LOCAL() {
|