Merge pull request xbmc#27528 from sundermann/heimdal-autoconf-bump

[depends][native] Heimdal and autoconf bump

Author: fuzzard

tools/depends/native/autoconf/AUTOCONF-VERSION

@@ -0,0 +1,7 @@
+LIBNAME=autoconf
+VERSION=2.72
+SOURCE=$(LIBNAME)-$(VERSION)
+ARCHIVE=$(SOURCE).tar.xz
+SHA512=c4e9fbd858666d3e5c3b4fe7f89aa3e8e3a0a00dc7e166f8147d937d911b77ba3ac6a016f9d223ccdd830bc8960b3e60397c0607cc6a1fd2c50c7492839ddd17
+
+BASE_URL=https://ftp.gnu.org/gnu/$(LIBNAME)

tools/depends/native/autoconf/Makefile

@@ -1,15 +1,7 @@
-include ../../Makefile.include
+include ../../Makefile.include AUTOCONF-VERSION ../../download-files.include
 PREFIX=$(NATIVEPREFIX)
 PLATFORM=$(NATIVEPLATFORM)
-DEPS = ../../Makefile.include Makefile ../../download-files.include
-
-# lib name, version
-LIBNAME=autoconf
-VERSION=2.71
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.xz
-SHA512=73d32b4adcbe24e3bafa9f43f59ed3b6efbd3de0f194e5ec90375f35da1199c583f5d3e89139b7edbad35171403709270e339ffa56a2ecb9b3123e9285021ff0
-include ../../download-files.include
+DEPS = ../../Makefile.include Makefile AUTOCONF-VERSION ../../download-files.include
 
 # configuration settings
 CONFIGURE=./configure --prefix=$(PREFIX)

tools/depends/native/heimdal/02-autoconf-2.70-configure.patch

@@ -0,0 +1,23 @@
+From 1b57b62d82a478c1fade350f0fb1d57031a8734e Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <[email protected]>
+Date: Sat, 10 Feb 2024 09:33:48 +0100
+Subject: [PATCH] cf/largefile.m4: Fix build with autoconf-2.72
+
+Fixes https://github.com/heimdal/heimdal/issues/1201
+---
+ cf/largefile.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cf/largefile.m4 b/cf/largefile.m4
+index 5c54897be4..cdbbc55431 100644
+--- a/cf/largefile.m4
++++ b/cf/largefile.m4
+@@ -10,7 +10,7 @@ dnl with generated code, such as lex
+ if test "$enable_largefile" != no -a "$ac_cv_sys_large_files" != no; then
+ 	CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=$ac_cv_sys_large_files"
+ fi
+-if test "$enable_largefile" != no -a "$ac_cv_sys_file_offset_bits" != no; then
++if test "$enable_largefile" != no -a "$ac_cv_sys_file_offset_bits" != no && test -n "$ac_cv_sys_file_offset_bits"; then
+ 	CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
+ fi
+ ])

tools/depends/native/heimdal/02-fix-build-with-autoconf-2.72.patch

@@ -0,0 +1,6 @@
+LIBNAME=heimdal
+VERSION=7.8.0
+ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
+SHA512=0167345aca77d65b7a1113874eee5b65ec6e1fec1f196d57e571265409fa35ef95a673a4fd4aafbb0ab5fb5b246b97412353a68d6613a8aff6393a9f1e72999e
+
+FULL_URL=https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz

tools/depends/native/heimdal/HEIMDAL-VERSION

@@ -1,15 +1,9 @@
-include ../../Makefile.include
+include ../../Makefile.include HEIMDAL-VERSION ../../download-files.include
 PREFIX=$(NATIVEPREFIX)
 PLATFORM=$(NATIVEPLATFORM)
-DEPS = ../../Makefile.include Makefile 01-disable-libedit.patch 02-autoconf-2.70-configure.patch ../../download-files.include
-
-# lib name, version
-LIBNAME=heimdal
-VERSION=7.7.0
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.gz
-SHA512=6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99
-include ../../download-files.include
+DEPS = ../../Makefile.include Makefile HEIMDAL-VERSION ../../download-files.include \
+			01-disable-libedit.patch \
+			02-fix-build-with-autoconf-2.72.patch
 
 APP=$(PLATFORM)/lib/asn1/asn1_compile
 
@@ -20,7 +14,7 @@ $(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE)
 	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); patch -p1 -i ../02-fix-build-with-autoconf-2.72.patch
 	cd $(PLATFORM); $(AUTORECONF) -vif
 	cd $(PLATFORM); ./configure --prefix=$(PREFIX) --disable-shared
 

tools/depends/native/heimdal/Makefile

@@ -1,14 +1,10 @@
-include ../../Makefile.include.in
+include ../../Makefile.include.in ../../native/autoconf/AUTOCONF-VERSION
 PREFIX=$(CURDIR)/../../pre-build-deps
 PLATFORM=native
 TARBALLS_LOCATION=$(PREFIX)
 RETRIEVE_TOOL=curl
 ARCHIVE_TOOL=tar
-# lib name, version
-LIBNAME=autoconf
-VERSION=2.71
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.xz
+DEPS = ../../Makefile.include.in Makefile ../../native/autoconf/AUTOCONF-VERSION
 
 export PATH:=$(CURDIR)/../../pre-build-deps/bin:$(PATH)