diff options
| author | Jose Luis Marti <joseluis.marti@gmail.com> | 2022-12-29 17:26:13 +0100 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2023-03-12 06:26:42 +1000 |
| commit | ee4d8a62b879800b796c5efff303808131c4f076 (patch) | |
| tree | fb63de8065bb6e4ae7bb21cf4338814e42c980af /tools/depends/target/gnutls | |
| parent | 42cacd676217bd3c5e1daebed65f2a16a59adaec (diff) | |
fix gnutls issue with ndk 21
Diffstat (limited to 'tools/depends/target/gnutls')
| -rw-r--r-- | tools/depends/target/gnutls/Makefile | 4 | ||||
| -rw-r--r-- | tools/depends/target/gnutls/android-fpending.patch | 13 |
2 files changed, 16 insertions, 1 deletions
diff --git a/tools/depends/target/gnutls/Makefile b/tools/depends/target/gnutls/Makefile index 25d2ad3e3e..335667d32a 100644 --- a/tools/depends/target/gnutls/Makefile +++ b/tools/depends/target/gnutls/Makefile @@ -1,7 +1,8 @@ include ../../Makefile.include GNUTLS-VERSION ../../download-files.include DEPS = ../../Makefile.include Makefile ../../download-files.include \ add-dl-as-private-lib.patch \ - 03-support-correct-cisdigit.patch + 03-support-correct-cisdigit.patch \ + android-fpending.patch # disable rpl_malloc and rpl_realloc symbols in glib # causes linking errors in libmicrohttpd and ffmpeg with missing symbols @@ -42,6 +43,7 @@ $(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) cd $(PLATFORM); patch -p1 -i ../add-dl-as-private-lib.patch cd $(PLATFORM); patch -p1 -i ../03-support-correct-cisdigit.patch + cd $(PLATFORM); patch -p1 -i ../android-fpending.patch cd $(PLATFORM); $(AUTORECONF) -vif cd $(PLATFORM); $(CONFIGURE) diff --git a/tools/depends/target/gnutls/android-fpending.patch b/tools/depends/target/gnutls/android-fpending.patch new file mode 100644 index 0000000000..a16f671908 --- /dev/null +++ b/tools/depends/target/gnutls/android-fpending.patch @@ -0,0 +1,13 @@ +--- a/src/gl/fpending.c ++++ b/src/gl/fpending.c +@@ -39,7 +39,9 @@ + #if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 + /* GNU libc, BeOS, Haiku, Linux libc5 */ + return fp->_IO_write_ptr - fp->_IO_write_base; +-#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ ++#elif defined __ANDROID__ ++ return fp_->_p - fp_->_bf._base; ++#elif defined __sferror || defined __DragonFly__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin < 1.7.34, Minix 3, Android */ + return fp->_p - fp->_bf._base; + #elif defined __EMX__ /* emx+gcc */ |