Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC
Commits:
85357e2d by Felix Paul Kühne at 2022-03-29T14:26:29+00:00
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.
- - - - -
2 changed files:
- + contrib/src/gnutls/gnutls-fix-aarch64-compilation-appleos.patch
- contrib/src/gnutls/rules.mak
Changes:
=====================================
contrib/src/gnutls/gnutls-fix-aarch64-compilation-appleos.patch
=====================================
@@ -0,0 +1,12 @@
+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 \
=====================================
contrib/src/gnutls/rules.mak
=====================================
@@ -37,6 +37,11 @@ gnutls: gnutls-$(GNUTLS_VERSION).tar.xz .sum-gnutls
# fix i686 UWP builds as they were using CertEnumCRLsInStore via
invalid LoadLibrary
$(APPLY) $(SRC)/gnutls/0001-fix-mingw64-detection.patch
+ # 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)
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/85357e2d60e528d1b5d204f7a17b50123d1df27d
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/85357e2d60e528d1b5d204f7a17b50123d1df27d
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
