Skip to content
Snippets Groups Projects
Commit 97612c39 authored by Felix Paul Kühne's avatar Felix Paul Kühne Committed by Hugo Beauzée-Luyssen
Browse files

contrib/gnutls: fix AArch64 build on appleOS

This introduces a patch to fix compilation on AArch64 on AppleOS, which
currently fails due to a compiler flag used by gnutls that is
unsupported by the latest version of clang (Apple clang version 13.1.6,
clang-1316.0.21.2) leading to a compiler crash if used.

This resolves the upstream tickets
https://gitlab.com/gnutls/gnutls/-/issues/1347 and
https://gitlab.com/gnutls/gnutls/-/issues/1317 for which the same patch
was already suggested.

(cherry picked from commit 85357e2d)
parent 810ce14d
No related branches found
No related tags found
2 merge requests!3533Backport MR 3236 to 3.0.x,!1773[3.0.x] contrib/gnutls: fix AArch64 build on appleOS
Pipeline #210865 passed with stage
in 45 minutes and 39 seconds
diff -ru gnutls/lib/accelerated/aarch64/Makefile.in gnutls/lib/accelerated/aarch64/Makefile.in
--- gnutls/lib/accelerated/aarch64/Makefile.in 2021-05-24 10:05:49.000000000 +0200
+++ gnutls/lib/accelerated/aarch64/Makefile.in 2022-03-28 15:06:23.000000000 +0200
@@ -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
EXTRA_DIST = README
noinst_LTLIBRARIES = libaarch64.la
libaarch64_la_SOURCES = aarch64-common.c aarch64-common.h \
......@@ -41,6 +41,12 @@ gnutls: gnutls-$(GNUTLS_VERSION).tar.xz .sum-gnutls
$(APPLY) $(SRC)/gnutls/0001-fix-mingw64-detection.patch
$(call pkg_static,"lib/gnutls.pc.in")
# fix AArch64 builds for Apple OS by removing unsupported compiler flag (gnutls#1347, gnutls#1317)
ifdef HAVE_DARWIN_OS
$(APPLY) $(SRC)/gnutls/gnutls-fix-aarch64-compilation-appleos.patch
endif
$(UPDATE_AUTOCONFIG)
$(MOVE)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment