diff --git a/security/nflib/Makefile b/security/nflib/Makefile index 6b821c36d14c..686d3f61c5e5 100644 --- a/security/nflib/Makefile +++ b/security/nflib/Makefile @@ -1,44 +1,40 @@ PORTNAME= nflib DISTVERSIONPREFIX= v DISTVERSION= 1.0.0-23 DISTVERSIONSUFFIX= -g5cf40ed -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security math MAINTAINER= yuri@FreeBSD.org COMMENT= NTT-based fast lattice cryptography library WWW= https://github.com/quarkslab/NFLlib LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT_LICENSE.txt BUILD_DEPENDS= as:devel/binutils ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= unconditionally includes amd64 assembler code LIB_DEPENDS= libmpfr.so:math/mpfr \ libgmp.so:math/gmp USES= cmake compiler:c++11-lang localbase USE_GITHUB= yes GH_ACCOUNT= quarkslab GH_PROJECT= NFLlib USE_LDCONFIG= yes CMAKE_ON= NFL_OPTIMIZED -OPTIONS_DEFINE= NATIVE - -NATIVE_DESC= Build with native optimizations (-march=native) - post-patch-NATIVE-off: @${REINPLACE_CMD} -e 's|-march=native|| ; s|-mtune=native||' ${WRKSRC}/CMakeLists.txt ${WRKSRC}/CMakeCompilers.txt do-test: @cd ${BUILD_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test .include diff --git a/security/nflib/files/patch-CMakeCompilers.txt b/security/nflib/files/patch-CMakeCompilers.txt new file mode 100644 index 000000000000..7448594f4a83 --- /dev/null +++ b/security/nflib/files/patch-CMakeCompilers.txt @@ -0,0 +1,11 @@ +--- CMakeCompilers.txt.orig 2023-08-07 06:26:47 UTC ++++ CMakeCompilers.txt +@@ -16,7 +16,7 @@ endif() + # optimization flags support + if(CMAKE_BUILD_TYPE MATCHES Release) + set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O3") +- foreach(FLAG -march=native -mtune=native -funroll-loops) ++ foreach(FLAG -funroll-loops) + string(REGEX REPLACE -= _ FLAG_ID ${FLAG}) + string(TOUPPER ${FLAG_ID} FLAG_ID) + CHECK_CXX_COMPILER_FLAG(${FLAG} COMPILER_SUPPORTS${FLAG_ID}) diff --git a/security/nflib/files/patch-CMakeLists.txt b/security/nflib/files/patch-CMakeLists.txt index 66188024ab0b..67616fe75fb4 100644 --- a/security/nflib/files/patch-CMakeLists.txt +++ b/security/nflib/files/patch-CMakeLists.txt @@ -1,9 +1,18 @@ ---- CMakeLists.txt.orig 2020-02-22 22:31:07 UTC +--- CMakeLists.txt.orig 2019-11-18 12:19:53 UTC +++ CMakeLists.txt +@@ -12,7 +12,7 @@ if(NFL_OPTIMIZED) + + include(CheckCXXSourceCompiles) + set(CMAKE_CXX_FLAGS_OLD ${CMAKE_CXX_FLAGS}) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") ++ #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") + + check_cxx_source_compiles("#include \nint main() { return 0;}" NFLLIB_USE_AVX) + check_cxx_source_compiles("#include \nint main() { return 0;}" NFLLIB_USE_SSE) @@ -64,4 +64,6 @@ install(FILES ${NFLLIB_HDRS_3} DESTINATION include/nfl install(FILES ${NFLLIB_HDRS_4} DESTINATION include/nfl/opt/arch) install(FILES ${NFLLIB_PRNG_HDRS} DESTINATION include/nfl/prng) +if (BUILD_TESTING) add_subdirectory(tests) +endif()