diff options
| author | fuzzard <fuzzard@users.noreply.github.com> | 2024-05-09 08:31:43 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-09 08:31:43 +1000 |
| commit | 8526557197e3346556c73010e025d712a531b5bf (patch) | |
| tree | 4ee83939dcbed2e3d2537c497667108f2a9f1d2e /tools/depends/target | |
| parent | 49fd0cd39fb22ea43bc339aba046a340cb9d7fab (diff) | |
| parent | 9a75ece6cfd4d9ea868dfa7f916b21b90ed4934d (diff) | |
Merge pull request #24995 from joseluismarti/fpending
[Android][gnutls] Remove fpending patch
Diffstat (limited to 'tools/depends/target')
| -rw-r--r-- | tools/depends/target/gnutls/Makefile | 4 | ||||
| -rw-r--r-- | tools/depends/target/gnutls/android-fpending.patch | 13 |
2 files changed, 1 insertions, 16 deletions
diff --git a/tools/depends/target/gnutls/Makefile b/tools/depends/target/gnutls/Makefile index 15cb98e617..1b1e5e3287 100644 --- a/tools/depends/target/gnutls/Makefile +++ b/tools/depends/target/gnutls/Makefile @@ -1,8 +1,7 @@ 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 \ - android-fpending.patch + 03-support-correct-cisdigit.patch # disable rpl_malloc and rpl_realloc symbols in glib # causes linking errors in libmicrohttpd and ffmpeg with missing symbols @@ -48,7 +47,6 @@ $(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 deleted file mode 100644 index a16f671908..0000000000 --- a/tools/depends/target/gnutls/android-fpending.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 */ |