git: 58dd53fbd1be - main - graphics/png: exclude SIMD from armv{6,7} in QEMU_EMULATING

From: Charlie Li <vishwin_at_FreeBSD.org>
Date: Mon, 31 Oct 2022 02:32:57 UTC
The branch main has been updated by vishwin:

URL: https://cgit.FreeBSD.org/ports/commit/?id=58dd53fbd1be436d2e56efcb673f122cb1bbf31c

commit 58dd53fbd1be436d2e56efcb673f122cb1bbf31c
Author:     Charlie Li <vishwin@FreeBSD.org>
AuthorDate: 2022-10-30 00:15:51 +0000
Commit:     Charlie Li <vishwin@FreeBSD.org>
CommitDate: 2022-10-31 02:31:54 +0000

    graphics/png: exclude SIMD from armv{6,7} in QEMU_EMULATING
    
    The current version added an assert for ARM NEON detection, which
    is not supported under QEMU_EMULATING, so the build fails. Prevent
    exposing the SIMD option in this case.
    
    Approved by: tcberner (mentor)
    Differential Revision: https://reviews.freebsd.org/D37212
---
 graphics/png/Makefile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 566dd86d9111..a06b80b15ef8 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -27,6 +27,11 @@ OPTIONS_DEFAULT=APNG
 OPTIONS_DEFAULT_aarch64=	SIMD
 OPTIONS_DEFAULT_amd64=	SIMD
 OPTIONS_DEFAULT_powerpc64le=	SIMD
+# arm/arm_init.c:43:6: error: "No support for run-time ARM Neon checking; use compile-time options"
+.ifdef QEMU_EMULATING
+OPTIONS_EXCLUDE_armv6=	SIMD
+OPTIONS_EXCLUDE_armv7=	SIMD
+.endif
 
 APNG_DESC=Enable Animated PNG support