[tools/depends][target] gnutls m1 patch clang -march=all failure

gnutls issue: https://gitlab.com/gnutls/gnutls/-/issues/1317

Essentially clang on buildhost aarch64 doesnt support -march=all flag that is hardcoded
in lib/accelerated/aarch64/Makefile.am and .in for AM_CCASFLAGS

error is seen as

libtool: compile:  /Users/Shared/xbmc-depends/arm-darwin21.4.0-native/bin/gas-preprocessor.pl /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -arch arm64 -Wa,-march=all -fheinous-gnu-extensions -ftree-vectorize -pipe -Wno-trigraphs -fpascal-strings -Wreturn-type -Wunused-variable -fmessage-length=0 -gdwarf-2 -g -D_DEBUG -arch arm64 -miphoneos-version-min=11.0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS15.4.sdk -isystem /Users/Shared/xbmc-depends/iphoneos15.4_arm64-target-debug/include -c macosx/sha1-armv8.s -o macosx/sha1-armv8.o
make[6]: *** [macosx/sha1-armv8.lo] Error 1

4 files changed, 29 insertions, 30 deletions

diff --git a/tools/depends/target/gnutls/01-macos-clang-accel.patch b/tools/depends/target/gnutls/01-macos-clang-accel.patch
new file mode 100644
index 0000000000..cf9647e940
--- /dev/null
+++ b/tools/depends/target/gnutls/01-macos-clang-accel.patch
@@ -0,0 +1,22 @@
+--- a/lib/accelerated/aarch64/Makefile.am
++++ b/lib/accelerated/aarch64/Makefile.am
+@@ -34,7 +34,7 @@
+ endif
+ 
+ #ensure that we have all aarch64 instruction sets enabled for the assembler
+-AM_CCASFLAGS = -Wa,-march=all
++#AM_CCASFLAGS = -Wa,-march=all
+ 
+ EXTRA_DIST = README
+ 
+--- a/lib/accelerated/aarch64/Makefile.in
++++ b/lib/accelerated/aarch64/Makefile.in
+@@ -1634,7 +1634,7 @@
+ 	-I$(srcdir)/../../ -I$(srcdir)/../ $(am__append_1)
+ 
+ #ensure that we have all aarch64 instruction sets enabled for the assembler
+-AM_CCASFLAGS = -Wa,-march=all
++#AM_CCASFLAGS = -Wa,-march=all
+ EXTRA_DIST = README
+ noinst_LTLIBRARIES = libaarch64.la
+ libaarch64_la_SOURCES = aarch64-common.c aarch64-common.h \
diff --git a/tools/depends/target/gnutls/Makefile b/tools/depends/target/gnutls/Makefile
index 368535f0dd..30bf8e297d 100644
--- a/tools/depends/target/gnutls/Makefile
+++ b/tools/depends/target/gnutls/Makefile
@@ -1,5 +1,7 @@
 include ../../Makefile.include
-DEPS = ../../Makefile.include Makefile size-max.patch add-dl-as-private-lib.patch 03-support-correct-cisdigit.patch ../../download-files.include
+DEPS = ../../Makefile.include Makefile ../../download-files.include \
+                              add-dl-as-private-lib.patch \
+                              01-macos-clang-accel.patch 03-support-correct-cisdigit.patch
 
 # lib name, version
 LIBNAME=gnutls
@@ -9,12 +11,6 @@ ARCHIVE=$(SOURCE).tar.xz
 SHA512=72c78d7fcb024393c1d15f2a1856608ae4460ba43cc5bbbb4c29b80508cae6cb822df4638029de2363437d110187e0a3cc19a7288c3b2f44b2f648399a028438
 include ../../download-files.include
 
-ifeq ($(OS),osx)
-ifeq ($(CPU),arm64)
-CONFIGURE_OPTIONS= --disable-hardware-acceleration
-endif
-endif
-
 # configuration settings
 CONFIGURE=./configure --prefix=$(PREFIX) --disable-shared --without-p11-kit --disable-nls --with-included-unistring \
                       --with-included-libtasn1 --enable-local-libopts --disable-doc --disable-tests --disable-guile \
@@ -24,12 +20,13 @@ LIBDYLIB=$(PLATFORM)/lib/.libs/lib$(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 ../size-max.patch
 	cd $(PLATFORM); patch -p1 -i ../add-dl-as-private-lib.patch
+ifeq ($(findstring apple-darwin, $(HOST)), apple-darwin)
+	cd $(PLATFORM); patch -p1 -i ../01-macos-clang-accel.patch
+endif
 	cd $(PLATFORM); patch -p1 -i ../03-support-correct-cisdigit.patch
 	cd $(PLATFORM); $(AUTORECONF) -vif
 	cd $(PLATFORM); $(CONFIGURE)
diff --git a/tools/depends/target/gnutls/add-dl-as-private-lib.patch b/tools/depends/target/gnutls/add-dl-as-private-lib.patch
index c04421d5c5..8531ac9259 100644
--- a/tools/depends/target/gnutls/add-dl-as-private-lib.patch
+++ b/tools/depends/target/gnutls/add-dl-as-private-lib.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -547,6 +547,9 @@
+@@ -552,6 +552,9 @@
  
  
  AC_LIB_HAVE_LINKFLAGS(dl,, [#include <dlfcn.h>], [dladdr (0, 0);])
diff --git a/tools/depends/target/gnutls/size-max.patch b/tools/depends/target/gnutls/size-max.patch
deleted file mode 100644
index fd4acfd977..0000000000
--- a/tools/depends/target/gnutls/size-max.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/gl/read-file.c
-+++ b/gl/read-file.c
-@@ -27,6 +27,7 @@
- 
- /* Get SIZE_MAX.  */
- #include <stdint.h>
-+#include <limits.h>
- 
- /* Get malloc, realloc, free. */
- #include <stdlib.h>
---- a/src/gl/read-file.c
-+++ b/src/gl/read-file.c
-@@ -27,6 +27,7 @@
- 
- /* Get SIZE_MAX.  */
- #include <stdint.h>
-+#include <limits.h>
- 
- /* Get malloc, realloc, free. */
- #include <stdlib.h>