diff --git a/math/libdivide/Makefile b/math/libdivide/Makefile index b2046853b51b..764f37805bd0 100644 --- a/math/libdivide/Makefile +++ b/math/libdivide/Makefile @@ -1,30 +1,35 @@ PORTNAME= libdivide DISTVERSION= 5.0 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= thierry@FreeBSD.org COMMENT= Fast prime counting function implementations WWW= https://libdivide.com/ LICENSE= ZLIB BSL LICENSE_COMB= multi USE_GITHUB= yes 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 +OPTIONS_DEFINE= NATIVE + +NATIVE_CMAKE_BOOL= FREEBSD_NATIVE + do-test: ${CONFIGURE_WRKSRC}/tester .include diff --git a/math/libdivide/files/patch-CMakeLists.txt b/math/libdivide/files/patch-CMakeLists.txt index b89ebfba8f21..4cb7764bb3f4 100644 --- a/math/libdivide/files/patch-CMakeLists.txt +++ b/math/libdivide/files/patch-CMakeLists.txt @@ -1,23 +1,28 @@ --- CMakeLists.txt.orig 2021-07-17 18:22:14 UTC +++ CMakeLists.txt @@ -16,9 +16,9 @@ include(CMakeSanitize) # Maximum warnings level & warnings as error add_compile_options( "$<$:/W4;/WX>" - "$<$:-Wall;-Wextra;-pedantic;-Werror>" - "$<$:-Wall;-Wextra;-pedantic;-Werror>" - "$<$:-Wall;-Wextra;-pedantic;-Werror>" + "$<$:-Wall;-Wextra;-pedanticr>" + "$<$:-Wall;-Wextra;-pedantic>" + "$<$:-Wall;-Wextra;-pedantic>" ) # Build options ################################################ -@@ -93,7 +93,6 @@ if (BUILD_TESTS AND NOT CMAKE_CROSSCOMPILING) +@@ -93,11 +93,10 @@ if (BUILD_TESTS AND NOT CMAKE_CROSSCOMPILING) CPU_ARM_NEON) if (CPU_X86 OR CPU_ARM_NEON) cmake_push_check_state() - set(CMAKE_REQUIRED_FLAGS -Werror) check_cxx_compiler_flag(-march=native MARCH_NATIVE) cmake_pop_check_state() +- if (MARCH_NATIVE) ++ if (MARCH_NATIVE AND FREEBSD_NATIVE) + list(APPEND LIBDIVIDE_FLAGS "-march=native") + endif() + endif()