diff options
| author | fuzzard <fuzzard@kodi.tv> | 2021-10-20 17:58:56 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2021-10-25 10:31:04 +1000 |
| commit | 0b9ad24d917f6c05f64309351caa658dc323066e (patch) | |
| tree | 46769794f580014d7c6e4377c13473f5a548be3e /tools/depends/target/curl | |
| parent | 623ffd58e8871af0c8680499b3d27d0b680edeb4 (diff) | |
[tools/depends][native] bump autoconf 2.71
[tools/depends][native] heimdal patch for build with autoconf 2.70+
Currently no new heimdal release, so we need to carry patch for use with autoconf 2.70+
https://github.com/heimdal/heimdal/pull/771
[tools/depends][target] fix curl building with autoconf 2.70+
Provide patch to allow curl 7.68.0 to build with autoconf 2.70+
Upstream commit https://github.com/curl/curl/commit/f25f602ffd026cc6b5bb0b3a6d8f1abe1bad7881
Upstream has this fixed in curl 7.70.0+, can drop patch when we bump curl to something newer
[tools/depends][native] patch autoconf gtkdocize out
autoconf 2.70+ have changed autoreconf to call gtkdocize regardless of state of GTK_DOC_CHECK
macro.
Details: https://savannah.gnu.org/support/?110503
Instead of patching any dependency (native or target) that has that macro (eg gnutls, harfbuzz)
patch out gtkdocerize call in autoreconf. GTK-doc is a "heavy" dependency to add without any
actual use (ie we dont use docs/man pages in tools/depends build system)
We do a sed replace on the installed autoreconf binary rather then the autoreconf.in because
autoconf forces a docs rebuild that then requires help2man as a dependency if we alter the
autoreconf.in. This way we dont need to add a "useless" dependency to our build system.
Diffstat (limited to 'tools/depends/target/curl')
| -rw-r--r-- | tools/depends/target/curl/01-patch-autoconf-GH-5130.patch | 11 | ||||
| -rw-r--r-- | tools/depends/target/curl/Makefile | 3 |
2 files changed, 13 insertions, 1 deletions
diff --git a/tools/depends/target/curl/01-patch-autoconf-GH-5130.patch b/tools/depends/target/curl/01-patch-autoconf-GH-5130.patch new file mode 100644 index 0000000000..119cd81199 --- /dev/null +++ b/tools/depends/target/curl/01-patch-autoconf-GH-5130.patch @@ -0,0 +1,11 @@ +--- a/m4/curl-functions.m4 ++++ b/m4/curl-functions.m4 +@@ -7289,8 +7289,6 @@ + dnl changes contained within this macro. + + AC_DEFUN([CURL_RUN_IFELSE], [ +- AC_REQUIRE([AC_RUN_IFELSE])dnl +- + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH diff --git a/tools/depends/target/curl/Makefile b/tools/depends/target/curl/Makefile index cea0a5e3aa..5d49fecdb7 100644 --- a/tools/depends/target/curl/Makefile +++ b/tools/depends/target/curl/Makefile @@ -1,5 +1,5 @@ include ../../Makefile.include -DEPS= ../../Makefile.include Makefile +DEPS= ../../Makefile.include Makefile 01-patch-autoconf-GH-5130.patch # lib name, version LIBNAME=curl @@ -22,6 +22,7 @@ $(TARBALLS_LOCATION)/$(ARCHIVE): $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) + cd $(PLATFORM); patch -p1 -i ../01-patch-autoconf-GH-5130.patch cd $(PLATFORM); $(AUTORECONF) -vif cd $(PLATFORM); $(CONFIGURE) |