Index: head/math/blasfeo/Makefile =================================================================== --- head/math/blasfeo/Makefile (revision 547962) +++ head/math/blasfeo/Makefile (revision 547963) @@ -1,38 +1,43 @@ # $FreeBSD$ PORTNAME= blasfeo -DISTVERSION= 0.1.1 -PORTREVISION= 2 +DISTVERSION= 0.1.2 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org COMMENT= Basic Linear Algebra Subroutines For Embedded Optimization LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt USES= cmake USE_GITHUB= yes GH_ACCOUNT= giaf CMAKE_ARGS= -DTARGET:STRING=GENERIC CMAKE_ON= BUILD_SHARED_LIBS OPTIONS_SINGLE= ${OPTIONS_SINGLE_${ARCH}} OPTIONS_SINGLE_amd64= TARGETAMD64 OPTIONS_SINGLE_TARGETAMD64= GENERIC X64_INTEL_HASWELL X64_INTEL_SANDY_BRIDGE X64_INTEL_CORE X64_AMD_BULLDOZER OPTIONS_DEFAULT_amd64= GENERIC # TODO ARM also has SIMD acceleration GENERIC_DESC= Generic C code without SIMD acceleration X64_INTEL_HASWELL_DESC= x86_64 architecture with AVX2 and FMA ISA (64 bit OS) X64_INTEL_SANDY_BRIDGE_DESC= x86_64 architecture with AVX ISA (64 bit OS) X64_INTEL_CORE_DESC= x86_64 architecture with SSE3 (64 bit OS) X64_AMD_BULLDOZER_DESC= x86_64 architecture with AVX and FMA ISA (64 bit OS) X64_INTEL_HASWELL_CMAKE_ON= -DTARGET:STRING=X64_INTEL_HASWELL X64_INTEL_SANDY_BRIDGE_CMAKE_ON= -DTARGET:STRING=X64_INTEL_SANDY_BRIDGE X64_INTEL_CORE_CMAKE_ON= -DTARGET:STRING=X64_INTEL_CORE X64_AMD_BULLDOZER_CMAKE_ON= -DTARGET:STRING=X64_AMD_BULLDOZER + +do-test: + @cd ${BUILD_WRKSRC} && \ + ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBLASFEO_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test .include Index: head/math/blasfeo/distinfo =================================================================== --- head/math/blasfeo/distinfo (revision 547962) +++ head/math/blasfeo/distinfo (revision 547963) @@ -1,3 +1,3 @@ -TIMESTAMP = 1566689393 -SHA256 (giaf-blasfeo-0.1.1_GH0.tar.gz) = a52169306dfcc43d0aa41b031b98f1d63a4fd0ec7e8139bf95f14dc270ec3b72 -SIZE (giaf-blasfeo-0.1.1_GH0.tar.gz) = 1235604 +TIMESTAMP = 1599541279 +SHA256 (giaf-blasfeo-0.1.2_GH0.tar.gz) = 079c9c90db1249aac59fa649c42667d46f4d458049e5986762035388f22fc005 +SIZE (giaf-blasfeo-0.1.2_GH0.tar.gz) = 1235375 Index: head/math/blasfeo/files/patch-CMakeLists.txt =================================================================== --- head/math/blasfeo/files/patch-CMakeLists.txt (revision 547962) +++ head/math/blasfeo/files/patch-CMakeLists.txt (revision 547963) @@ -1,29 +1,11 @@ ---- CMakeLists.txt.orig 2019-02-04 20:56:09 UTC +--- CMakeLists.txt.orig 2020-08-13 11:04:25 UTC +++ CMakeLists.txt -@@ -95,7 +95,7 @@ configure_file(${PROJECT_SOURCE_DIR}/blasfeo_target.h. - #set(BUILD_SHARED_LIBS ON CACHE STRING "Build shared libraries") - - # installation directory --if(CMAKE_INSTALL_PREFIX MATCHES "/usr/local") -+if(FALSE AND CMAKE_INSTALL_PREFIX MATCHES "/usr/local") - set(CMAKE_INSTALL_PREFIX "/opt/blasfeo") - endif() - -@@ -171,7 +171,7 @@ if(${MACRO_LEVEL} MATCHES 2) - endif() - - # --if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") -+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|DragonFly") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DOS_LINUX") - set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -DOS_LINUX") - endif() -@@ -827,7 +827,7 @@ install(TARGETS blasfeo EXPORT blasfeoConfig +@@ -1117,7 +1117,7 @@ install(TARGETS blasfeo EXPORT blasfeoConfig RUNTIME DESTINATION bin) -install(EXPORT blasfeoConfig DESTINATION cmake) +install(EXPORT blasfeoConfig DESTINATION lib/cmake) file(GLOB_RECURSE BLASFEO_HEADERS "include/*.h") install(FILES ${BLASFEO_HEADERS} DESTINATION ${BLASFEO_HEADERS_INSTALLATION_DIRECTORY}) Index: head/math/blasfeo/pkg-plist =================================================================== --- head/math/blasfeo/pkg-plist (revision 547962) +++ head/math/blasfeo/pkg-plist (revision 547963) @@ -1,38 +1,40 @@ include/blasfeo.h include/blasfeo_block_size.h include/blasfeo_common.h include/blasfeo_d_aux.h include/blasfeo_d_aux_ext_dep.h include/blasfeo_d_aux_ext_dep_ref.h include/blasfeo_d_aux_old.h include/blasfeo_d_aux_ref.h include/blasfeo_d_aux_test.h include/blasfeo_d_blas.h include/blasfeo_d_blas_api.h include/blasfeo_d_blasfeo_api.h include/blasfeo_d_blasfeo_api_ref.h include/blasfeo_d_kernel.h include/blasfeo_i_aux_ext_dep.h include/blasfeo_m_aux.h include/blasfeo_naming.h +include/blasfeo_processor_features.h include/blasfeo_s_aux.h include/blasfeo_s_aux_ext_dep.h include/blasfeo_s_aux_ext_dep_ref.h include/blasfeo_s_aux_old.h include/blasfeo_s_aux_ref.h include/blasfeo_s_aux_test.h include/blasfeo_s_blas.h include/blasfeo_s_blas_api.h include/blasfeo_s_blasfeo_api.h include/blasfeo_s_blasfeo_api_ref.h include/blasfeo_s_kernel.h +include/blasfeo_stdlib.h include/blasfeo_target.h include/blasfeo_timing.h include/blasfeo_v_aux_ext_dep.h include/d_blas.h include/d_blas_64.h include/s_blas.h include/s_blas_64.h lib/cmake/blasfeoConfig-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/blasfeoConfig.cmake lib/libblasfeo.so