git: 9b27d492beb5 - 2022Q3 - math/libdivide: fix build on armv6/armv7

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Thierry Thomas <thierry_at_FreeBSD.org>
Date: Sat, 27 Aug 2022 14:45:25 UTC

The branch 2022Q3 has been updated by thierry:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9b27d492beb59e256c8f092c4af2da6d7c996255

commit 9b27d492beb59e256c8f092c4af2da6d7c996255
Author:     Robert Clausecker <fuz@fuz.su>
AuthorDate: 2022-08-27 14:37:17 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2022-08-27 14:44:27 +0000

    math/libdivide: fix build on armv6/armv7
    
    The NEON code included in this library is for arm64 only.
    Disable use of NEON on armv6/armv7.
    
    See <https://github.com/ridiculousfish/libdivide/issues/102>.
    
    PR:             265870
    Reported by:    fuz (at) fuz.su
    
    (cherry picked from commit fbab55b27f97ce1d6cf067a1583b28716f2e127c)
---
 math/libdivide/Makefile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/math/libdivide/Makefile b/math/libdivide/Makefile
index 689e0e917306..cce21f560ffe 100644
--- a/math/libdivide/Makefile
+++ b/math/libdivide/Makefile
@@ -16,6 +16,11 @@ GH_ACCOUNT=	ridiculousfish
 USES=		cmake compiler:c++11-lang
 NO_ARCH=	yes
 
+# NEON support requires arm64
+CMAKE_OFF_armv6=	LIBDIVIDE_NEON
+CMAKE_OFF_armv7=	LIBDIVIDE_NEON
+CMAKE_OFF=	${CMAKE_OFF_${ARCH}}
+
 PLIST_FILES=	include/libdivide.h	\
 		lib/cmake/libdivide/libdivideConfig.cmake	\
 		lib/cmake/libdivide/libdivideConfigVersion.cmake