lukechilds
/
termux-packages
mirror of https://github.com/lukechilds/termux-packages.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
8362 Commits
6 Branches
0 Tags
18 MiB
Branch: android-5
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'android-5'
${ noResults }
termux-packages/ndk-patches/sys-cdefs.h.patch

24 lines
1.1 KiB
Raw Permalink Normal View History

Define __TERMUX__ and __TERMUX_PREFIX__ By defining __TERMUX__ and __TERMUX_PREFIX__ in <sys/cdefs.h> (which is basically always included) one can more easily target Termux specifically, both when cross-compiling packages and when code is built on-device.
5 years ago
diff -u -r /home/builder/lib/android-ndk/sysroot/usr/include/sys/cdefs.h ./usr/include/sys/cdefs.h
--- /home/builder/lib/android-ndk/sysroot/usr/include/sys/cdefs.h 2019-05-22 12:49:28.000000000 +0000
+++ ./usr/include/sys/cdefs.h 2019-09-19 19:18:03.978640526 +0000
@@ -176,7 +176,11 @@
update ndk to 17 and switch some packages to clang build (#2415) * update ndk to 17 * bump NDK version in setup-android script * libnl: fix for ndk r17 * libpixman: use clang's __builtin_shufflevector instead of __builtin_shuffle (#1) Required to make package build with ndk17. * fix as for arm * ndk17 still uses ld.bfd on aarch64 * use -fno-integrated-as for clang only * glib: remove patch unnecessary after ndk17 * torsocks: remove unneeded patch after ndk17 * subversion: fix build as clang++ now errors out for mismatched flags * libpulseaudio: fix build with ndk17 https://github.com/termux/termux-packages/pull/2415#issuecomment-388296684 * gst-plugins-good: disable video4linux2 ioctl is defined as __overloadable in ndk17 headers which conflicts with v4l2object's member ioctl * libzmq: disable Werror to build with ndk17 * ltrace: hardcode symbol not available in ndk17 * busybox: build with clang for all arches except arm * dropbear: build with clang instead of gcc * gnupg: build with clang instead of gcc * openssl: use clang for all arches except arm * picolisp: build with clang instead of gcc * valgrind: use clang on all arches except aarch64 * Revert "gst-plugins-good: disable video4linux2" This reverts commit 43850b81ccf60033c25cb13dfd326c1b0528773a. Already applied on base branch. * libllvm: use default arm triple
7 years ago
* _FILE_OFFSET_BITS 64 support.
* See https://android.googlesource.com/platform/bionic/+/master/docs/32-bit-abi.md
*/
Update from NDK version used from r15b to r15c The docker image has been updated - run scripts/update-docker.sh
8 years ago
-#if !defined(__LP64__) && defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
+/* Using _FILE_OFFSET_BITS=64 does not work well on Android
Make it possible to opt in to _FILE_OFFSET_BITS=64
8 years ago
+ * and can cause problems when mixing libraries, which is why
+ * Termux hides away this unless TERMUX_EXPOSE_FILE_OFFSET64
+ * is defined. */
Update from NDK version used from r15b to r15c The docker image has been updated - run scripts/update-docker.sh
8 years ago
+#if !defined(__LP64__) && defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 && defined(TERMUX_EXPOSE_FILE_OFFSET64)
update ndk to 17 and switch some packages to clang build (#2415) * update ndk to 17 * bump NDK version in setup-android script * libnl: fix for ndk r17 * libpixman: use clang's __builtin_shufflevector instead of __builtin_shuffle (#1) Required to make package build with ndk17. * fix as for arm * ndk17 still uses ld.bfd on aarch64 * use -fno-integrated-as for clang only * glib: remove patch unnecessary after ndk17 * torsocks: remove unneeded patch after ndk17 * subversion: fix build as clang++ now errors out for mismatched flags * libpulseaudio: fix build with ndk17 https://github.com/termux/termux-packages/pull/2415#issuecomment-388296684 * gst-plugins-good: disable video4linux2 ioctl is defined as __overloadable in ndk17 headers which conflicts with v4l2object's member ioctl * libzmq: disable Werror to build with ndk17 * ltrace: hardcode symbol not available in ndk17 * busybox: build with clang for all arches except arm * dropbear: build with clang instead of gcc * gnupg: build with clang instead of gcc * openssl: use clang for all arches except arm * picolisp: build with clang instead of gcc * valgrind: use clang on all arches except aarch64 * Revert "gst-plugins-good: disable video4linux2" This reverts commit 43850b81ccf60033c25cb13dfd326c1b0528773a. Already applied on base branch. * libllvm: use default arm triple
7 years ago
# define __USE_FILE_OFFSET64 1
/*
* Note that __RENAME_IF_FILE_OFFSET64 is only valid if the off_t and off64_t
Define __TERMUX__ and __TERMUX_PREFIX__ By defining __TERMUX__ and __TERMUX_PREFIX__ in <sys/cdefs.h> (which is basically always included) one can more easily target Termux specifically, both when cross-compiling packages and when code is built on-device.
5 years ago
@@ -336,3 +340,6 @@
#include <android/versioning.h>
#include <android/api-level.h>
+
+#define __TERMUX__ 1
+#define __TERMUX_PREFIX__ "@TERMUX_PREFIX@"