From 1d8cf02e88e212cf4c7bc9b18ccdc582a5edb95b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 14 Nov 2024 16:51:22 +0100 Subject: [PATCH] Revert "package/libpng: fix arm soft-float build" This reverts commit 4875dbed58837174780e3f7c6ec7ef419fdbe9fe. Signed-off-by: Peter Korsgaard --- package/libpng/libpng.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index 9761993d79..3e7fc42d82 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -17,9 +17,7 @@ HOST_LIBPNG_DEPENDENCIES = host-pkgconf host-zlib LIBPNG_CONFIG_SCRIPTS = libpng$(LIBPNG_SERIES)-config libpng-config LIBPNG_CONF_OPTS = --disable-tools -ifeq ($(BR2_aarch64),y) -LIBPNG_CONF_OPTS += --enable-arm-neon -else ifeq ($(BR2_ARM_CPU_HAS_NEON):$(BR2_ARM_SOFT_FLOAT),y:) +ifeq ($(BR2_ARM_CPU_HAS_NEON)$(BR2_aarch64),y) LIBPNG_CONF_OPTS += --enable-arm-neon else LIBPNG_CONF_OPTS += --disable-arm-neon