svn commit: r496945 - head/multimedia/dav1d

[Jan Beich]

Author: jbeich
Date: Wed Mar 27 11:50:26 2019
New Revision: 496945
URL: https://svnweb.freebsd.org/changeset/ports/496945

Log:
  multimedia/dav1d: adjust r496941 for CFI (depends on LTO)
  
  Don't disable LTO, let assembly add padding to maintain alignment.
  https://chromium.googlesource.com/chromium/src.git/+/3a2c2029e0ee

Modified:
  head/multimedia/dav1d/Makefile   (contents, props changed)

Modified: head/multimedia/dav1d/Makefile
==============================================================================
--- head/multimedia/dav1d/Makefile	Wed Mar 27 11:41:30 2019	(r496944)
+++ head/multimedia/dav1d/Makefile	Wed Mar 27 11:50:26 2019	(r496945)
@@ -29,11 +29,6 @@ CFLAGS_armv6=	-no-integrated-as -B${LOCALBASE}/bin
 CFLAGS_armv7=	-no-integrated-as -B${LOCALBASE}/bin
 LDFLAGS_i386=	-Wl,-z,notext
 
-# https://bugs.llvm.org/show_bug.cgi?id=40635
-CFLAGS+=	${CFLAGS_${CHOSEN_COMPILER_TYPE}_${ARCH}}
-CFLAGS_clang_amd64=	-fno-lto
-CFLAGS_clang_i386=	-fno-lto
-
 OPTIONS_DEFINE=	TEST
 
 TEST_GL_TUPLE=	videolan:dav1d-test-data:3ccdd3df4fb8583d58bcc0101e315b00ec3ae130:testdata/tests/dav1d-test-data
@@ -41,6 +36,13 @@ TEST_MESON_TRUE=build_tests testdata_tests
 
 .if make(makesum) # for optional distfiles
 .MAKEFLAGS:	WITH="${OPTIONS_DEFINE}"
+.endif
+
+# https://bugs.llvm.org/show_bug.cgi?id=40635
+.if !empty(CFLAGS:M-flto*)
+MESON_ARGS+=	${MESON_ARGS_${CHOSEN_COMPILER_TYPE}_${ARCH}}
+MESON_ARGS_clang_amd64=	-Dstack_alignment=16
+MESON_ARGS_clang_i386=	-Dstack_alignment=4
 .endif
 
 pre-install-TEST-on: do-test