[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.

6 files changed, 32 insertions, 31 deletions

diff --git a/tools/depends/native/autoconf/Makefile b/tools/depends/native/autoconf/Makefile
index bb5d2f894c..2cf43d43cf 100644
--- a/tools/depends/native/autoconf/Makefile
+++ b/tools/depends/native/autoconf/Makefile
@@ -1,13 +1,13 @@
 include ../../Makefile.include
 PREFIX=$(NATIVEPREFIX)
 PLATFORM=$(NATIVEPLATFORM)
-DEPS= ../../Makefile.include Makefile endian-c++11-narrowing.patch
+DEPS= ../../Makefile.include Makefile
 
 # lib name, version
 LIBNAME=autoconf
-VERSION=2.69
+VERSION=2.71
 SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.gz
+ARCHIVE=$(SOURCE).tar.xz
 
 # configuration settings
 CONFIGURE=./configure --prefix=$(PREFIX)
@@ -22,14 +22,14 @@ $(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 ../endian-c++11-narrowing.patch
 
 $(LIBDYLIB): $(PLATFORM)
 	cd $(PLATFORM); $(CONFIGURE)
-	$(MAKE) -C $(PLATFORM)
+	$(MAKE) -C $(PLATFORM) install
+# patch autoreconf to not use gtkdocize. Details: https://savannah.gnu.org/support/?110503
+	cd $(NATIVEPREFIX); sed -ie 's|$uses_gtkdoc = 1              if \$$macro eq "GTK_DOC_CHECK";|$uses_gtkdoc = 0;  #            if \$$macro eq "GTK_DOC_CHECK";|' bin/autoreconf
 
 .installed-$(PLATFORM): $(LIBDYLIB)
-	$(MAKE) -C $(PLATFORM) install
 	touch $@
 
 clean:
diff --git a/tools/depends/native/autoconf/endian-c++11-narrowing.patch b/tools/depends/native/autoconf/endian-c++11-narrowing.patch
deleted file mode 100644
index 444f818910..0000000000
--- a/tools/depends/native/autoconf/endian-c++11-narrowing.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/lib/autoconf/c.m4
-+++ b/lib/autoconf/c.m4
-@@ -1553,16 +1553,16 @@
- 	[# Try to guess by grepping values from an object file.
- 	 AC_COMPILE_IFELSE(
- 	   [AC_LANG_PROGRAM(
--	      [[short int ascii_mm[] =
-+	      [[unsigned short int ascii_mm[] =
- 		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
--		short int ascii_ii[] =
-+		unsigned short int ascii_ii[] =
- 		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
- 		int use_ascii (int i) {
- 		  return ascii_mm[i] + ascii_ii[i];
- 		}
--		short int ebcdic_ii[] =
-+		unsigned short int ebcdic_ii[] =
- 		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
--		short int ebcdic_mm[] =
-+		unsigned short int ebcdic_mm[] =
- 		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
- 		int use_ebcdic (int i) {
- 		  return ebcdic_mm[i] + ebcdic_ii[i];
diff --git a/tools/depends/native/heimdal/02-autoconf-2.70-configure.patch b/tools/depends/native/heimdal/02-autoconf-2.70-configure.patch
new file mode 100644
index 0000000000..72755047f1
--- /dev/null
+++ b/tools/depends/native/heimdal/02-autoconf-2.70-configure.patch
@@ -0,0 +1,11 @@
+--- a/cf/check-var.m4
++++ b/cf/check-var.m4
+@@ -20,7 +20,7 @@
+ if test "$ac_foo" = yes; then
+ 	AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]$1), 1, 
+ 		[Define if you have the `]$1[' variable.])
+-	m4_ifval([$2], AC_CHECK_DECLS([$1],[],[],[$2]))
++	m4_ifval([$2], [AC_CHECK_DECLS([$1],[],[],[$2])])
+ fi
+ ])
+ 
diff --git a/tools/depends/native/heimdal/Makefile b/tools/depends/native/heimdal/Makefile
index 6737c7982a..f9c940e330 100644
--- a/tools/depends/native/heimdal/Makefile
+++ b/tools/depends/native/heimdal/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.include
 PREFIX=$(NATIVEPREFIX)
 PLATFORM=$(NATIVEPLATFORM)
-DEPS= ../../Makefile.include Makefile 01-disable-libedit.patch
+DEPS= ../../Makefile.include Makefile 01-disable-libedit.patch 02-autoconf-2.70-configure.patch
 
 # lib name, version
 LIBNAME=heimdal
@@ -20,6 +20,7 @@ $(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-disable-libedit.patch
+	cd $(PLATFORM); patch -p1 -i ../02-autoconf-2.70-configure.patch
 	cd $(PLATFORM); $(AUTORECONF) -vif
 	cd $(PLATFORM); ./configure --prefix=$(PREFIX) --disable-shared
 
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)