Fix gnutls on aarch64 after the llvm 13 update (was: Re: aarch64 bulk build report)

On Mon, Dec 20 2021, phessler@openbsd.org wrote:
> bulk build on arm64.ports.openbsd.org
> started on Mon Dec 20 03:38:26 MST 2021
> finished at Mon Dec 20 22:29:47 MST 2021
> lasted 0D18h51m
> done with kern.version=OpenBSD 7.0-current (GENERIC.MP) #1455: Sun Dec 19 14:58:17 MST 2021
>
> built packages:8238
> Dec 20:8237
>
>
> critical path missing pkgs: http://build-failures.rhaalovely.net/aarch64/2021-12-20/summary.log

[...]

> http://build-failures.rhaalovely.net/aarch64/2021-12-20/security/gnutls.log

This crash has already been hit by the FreeBSD folks;
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=260078

-march=all seems unsupported by clang, this diff fixes the crash but
doesn't add support for -march=all
https://reviews.llvm.org/D114677

The untested diff below removes the use of -march=all to fix the build
on aarch64. Tests and ok welcome.


Index: Makefile
===================================================================
RCS file: /cvs/ports/security/gnutls/Makefile,v
retrieving revision 1.169
diff -u -p -r1.169 Makefile
--- Makefile 29 May 2021 22:43:09 -0000 1.169
+++ Makefile 27 Dec 2021 16:03:05 -0000
@@ -3,6 +3,7 @@
COMMENT= GNU Transport Layer Security library

V= 3.7.2
+REVISION= 0
DISTNAME= gnutls-${V}
EXTRACT_SUFX= .tar.xz

Index: patches/patch-lib_accelerated_aarch64_Makefile_in
===================================================================
RCS file: patches/patch-lib_accelerated_aarch64_Makefile_in
diff -N patches/patch-lib_accelerated_aarch64_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_accelerated_aarch64_Makefile_in 27 Dec 2021 16:03:05 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Avoid -march=all, unsupported by clang.
+Clang commit that fixes the crash but doesn't add support for -march=all:
+https://reviews.llvm.org/D114677
+
+Index: lib/accelerated/aarch64/Makefile.in
+--- lib/accelerated/aarch64/Makefile.in.orig
++++ lib/accelerated/aarch64/Makefile.in
+@@ -2104,7 +2104,7 @@ AM_CPPFLAGS = -I$(srcdir)/../../../gl -I$(builddir)/..
+ -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 \


--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE