diff options
| author | fuzzard <fuzzard@kodi.tv> | 2022-09-25 12:25:49 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2022-09-27 05:57:53 +1000 |
| commit | cd8597bd84dcc0391accb436d39a785000913018 (patch) | |
| tree | 7ec74750d93859d8a7dcea35905bf4ea2866412f /tools | |
| parent | 0c19e6828aa35d6ea52703cda4963a209a8b9372 (diff) | |
[tools/depends][target] Bump libmicrohttpd 0.9.75
Patch introduced to remove assert. As suggested by Karlson2k in discussion
https://github.com/xbmc/xbmc/pull/21917
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/target/libmicrohttpd/001-remove-assert.patch | 11 | ||||
| -rw-r--r-- | tools/depends/target/libmicrohttpd/LIBMICROHTTPD-VERSION | 4 | ||||
| -rw-r--r-- | tools/depends/target/libmicrohttpd/Makefile | 29 |
3 files changed, 29 insertions, 15 deletions
diff --git a/tools/depends/target/libmicrohttpd/001-remove-assert.patch b/tools/depends/target/libmicrohttpd/001-remove-assert.patch new file mode 100644 index 0000000000..472cc279c7 --- /dev/null +++ b/tools/depends/target/libmicrohttpd/001-remove-assert.patch @@ -0,0 +1,11 @@ +--- a/src/microhttpd/connection.c ++++ b/src/microhttpd/connection.c +@@ -1024,7 +1024,7 @@ + struct MHD_Response *response; + + response = connection->response; +- mhd_assert (connection->rp_props.send_reply_body); ++// mhd_assert (connection->rp_props.send_reply_body); + + if ( (0 == response->total_size) || + /* TODO: replace the next check with assert */ diff --git a/tools/depends/target/libmicrohttpd/LIBMICROHTTPD-VERSION b/tools/depends/target/libmicrohttpd/LIBMICROHTTPD-VERSION new file mode 100644 index 0000000000..b6c751d7ef --- /dev/null +++ b/tools/depends/target/libmicrohttpd/LIBMICROHTTPD-VERSION @@ -0,0 +1,4 @@ +LIBNAME=libmicrohttpd +VERSION=0.9.75 +ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz +SHA512=4dc62ed191342a61cc2767171bb1ff4050f390db14ef7100299888237b52ea0b04b939c843878fe7f5daec2b35a47b3c1b7e7c11fb32d458184fe6b19986a37c diff --git a/tools/depends/target/libmicrohttpd/Makefile b/tools/depends/target/libmicrohttpd/Makefile index fb1bb8ee3e..6bae6ce677 100644 --- a/tools/depends/target/libmicrohttpd/Makefile +++ b/tools/depends/target/libmicrohttpd/Makefile @@ -1,28 +1,28 @@ -include ../../Makefile.include -DEPS = ../../Makefile.include Makefile ../../download-files.include - -# lib name, version -LIBNAME=libmicrohttpd -VERSION=0.9.73 -SOURCE=$(LIBNAME)-$(VERSION) -ARCHIVE=$(SOURCE).tar.gz -SHA512=473996b087ac6734ab577a1c7681c6c0b0136e04e34e13c3b50fd758358c1516017ad79097e0c57792786f6dd0208834374c09238113efed13bb4be11ef649d3 -include ../../download-files.include +include ../../Makefile.include LIBMICROHTTPD-VERSION ../../download-files.include +DEPS = ../../Makefile.include Makefile LIBMICROHTTPD-VERSION ../../download-files.include \ + 001-remove-assert.patch # configuration settings CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \ - ./configure --prefix=$(PREFIX) --disable-shared \ - --disable-doc --disable-examples --disable-curl \ - --enable-https + ./configure --prefix=$(PREFIX) \ + --disable-shared \ + --disable-doc \ + --disable-examples \ + --disable-curl \ + --enable-https + +ifeq ($(DEBUG_BUILD), yes) + CONFIGURE+= --enable-asserts +endif LIBDYLIB=$(PLATFORM)/src/microhttpd/.libs/$(LIBNAME).a all: .installed-$(PLATFORM) - $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) $(DEPS) rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) + cd $(PLATFORM); patch -p1 -i ../001-remove-assert.patch cd $(PLATFORM); $(CONFIGURE) $(LIBDYLIB): $(PLATFORM) @@ -38,4 +38,3 @@ clean: distclean:: rm -rf $(PLATFORM) .installed-$(PLATFORM) - |