diff options
| author | Yuri Victorovich <yuri@FreeBSD.org> | 2023-08-28 05:57:33 +0000 |
|---|---|---|
| committer | Yuri Victorovich <yuri@FreeBSD.org> | 2023-08-28 05:57:45 +0000 |
| commit | 63f6f812b06ecd92572ec67e3de9eaa2b299f2fa (patch) | |
| tree | 268a3fa02c3fe05bebfe0445c6a909b691b7b1ca | |
| parent | 0c747fb832f03dd1ad6ef68af2d7c95c94465822 (diff) | |
| download | ports-63f6f812b06ecd92572ec67e3de9eaa2b299f2fa.tar.gz ports-63f6f812b06ecd92572ec67e3de9eaa2b299f2fa.zip | |
math/xtensor: update 0.24.3 → 0.24.6
Reported by: portscout
| -rw-r--r-- | math/xtensor/Makefile | 13 | ||||
| -rw-r--r-- | math/xtensor/distinfo | 6 | ||||
| -rw-r--r-- | math/xtensor/files/patch-test_CMakeLists.txt | 17 | ||||
| -rw-r--r-- | math/xtensor/pkg-plist | 8 |
4 files changed, 22 insertions, 22 deletions
diff --git a/math/xtensor/Makefile b/math/xtensor/Makefile index 54c40be2b54d..e9428ad75a03 100644 --- a/math/xtensor/Makefile +++ b/math/xtensor/Makefile @@ -1,5 +1,5 @@ PORTNAME= xtensor -DISTVERSION= 0.24.3 +DISTVERSION= 0.24.6 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org @@ -18,18 +18,13 @@ TEST_DEPENDS= nlohmann-json>0:devel/nlohmann-json \ doctest>0:devel/doctest \ googletest>0:devel/googletest -USES= cmake +USES= cmake:testing # 2 tests fail, see https://github.com/xtensor-stack/xtensor/issues/2722 USE_GITHUB= yes GH_ACCOUNT= xtensor-stack +CMAKE_TESTING_ON= BUILD_TESTS + NO_BUILD= yes NO_ARCH= yes -do-test: install # https://github.com/xtensor-stack/xtensor/issues/2466 - @${RLN} ${STAGEDIR}${PREFIX}/include ${WRKSRC}/test/staged-include - @cd ${WRKSRC}/test && \ - ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} . && \ - ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} && \ - ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} xtest - .include <bsd.port.mk> diff --git a/math/xtensor/distinfo b/math/xtensor/distinfo index 40c73b506abc..60711daa94af 100644 --- a/math/xtensor/distinfo +++ b/math/xtensor/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1661721179 -SHA256 (xtensor-stack-xtensor-0.24.3_GH0.tar.gz) = 3acde856b9fb8cf4e2a7b66726da541275d40ab9b002e618ad985ab97f08ca4f -SIZE (xtensor-stack-xtensor-0.24.3_GH0.tar.gz) = 1193952 +TIMESTAMP = 1693200715 +SHA256 (xtensor-stack-xtensor-0.24.6_GH0.tar.gz) = f87259b51aabafdd1183947747edfff4cff75d55375334f2e81cee6dc68ef655 +SIZE (xtensor-stack-xtensor-0.24.6_GH0.tar.gz) = 1209533 diff --git a/math/xtensor/files/patch-test_CMakeLists.txt b/math/xtensor/files/patch-test_CMakeLists.txt index 8af92f7ff4c5..34e39d3fd070 100644 --- a/math/xtensor/files/patch-test_CMakeLists.txt +++ b/math/xtensor/files/patch-test_CMakeLists.txt @@ -1,6 +1,6 @@ ---- test/CMakeLists.txt.orig 2021-10-18 16:59:30 UTC +--- test/CMakeLists.txt.orig 2023-03-20 09:44:36 UTC +++ test/CMakeLists.txt -@@ -17,8 +17,8 @@ if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR +@@ -14,12 +14,13 @@ if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR enable_testing() @@ -10,8 +10,13 @@ + #set(XTENSOR_INCLUDE_DIR ${xtensor_INCLUDE_DIRS}) endif () + find_package(doctest REQUIRED) + find_package(Threads) ++find_package(GTest) + if(NOT CMAKE_BUILD_TYPE) -@@ -272,7 +272,7 @@ foreach(filename IN LISTS COMMON_BASE XTENSOR_TESTS) + message(STATUS "Setting tests build type to Release") +@@ -273,7 +274,7 @@ foreach(filename IN LISTS COMMON_BASE XTENSOR_TESTS) target_compile_definitions(${targetname} PRIVATE XTENSOR_USE_OPENMP) endif() target_include_directories(${targetname} PRIVATE ${XTENSOR_INCLUDE_DIR}) @@ -20,7 +25,7 @@ add_custom_target( x${targetname} COMMAND ${targetname} -@@ -298,7 +298,7 @@ if(XTENSOR_USE_OPENMP) +@@ -299,7 +300,7 @@ if(XTENSOR_USE_OPENMP) endif() target_include_directories(test_xtensor_lib PRIVATE ${XTENSOR_INCLUDE_DIR}) @@ -29,8 +34,8 @@ add_custom_target(xtest COMMAND test_xtensor_lib DEPENDS test_xtensor_lib) add_test(NAME xtest COMMAND test_xtensor_lib) -@@ -309,5 +309,5 @@ add_test(NAME xtest COMMAND test_xtensor_lib) - add_library(test_xtensor_core_lib ${COMMON_BASE} ${TEST_HEADERS} ${XTENSOR_HEADERS}) +@@ -310,5 +311,5 @@ add_test(NAME xtest COMMAND test_xtensor_lib) + add_library(test_xtensor_core_lib STATIC ${COMMON_BASE} ${TEST_HEADERS} ${XTENSOR_HEADERS}) target_include_directories(test_xtensor_core_lib PRIVATE ${XTENSOR_INCLUDE_DIR}) -target_link_libraries(test_xtensor_core_lib PRIVATE xtensor doctest::doctest ${CMAKE_THREAD_LIBS_INIT}) diff --git a/math/xtensor/pkg-plist b/math/xtensor/pkg-plist index 71a24dc42451..1675a78d7ed1 100644 --- a/math/xtensor/pkg-plist +++ b/math/xtensor/pkg-plist @@ -71,7 +71,7 @@ include/xtensor/xutils.hpp include/xtensor/xvectorize.hpp include/xtensor/xview.hpp include/xtensor/xview_utils.hpp -lib/cmake/xtensor/xtensorConfig.cmake -lib/cmake/xtensor/xtensorConfigVersion.cmake -lib/cmake/xtensor/xtensorTargets.cmake -libdata/pkgconfig/xtensor.pc +share/cmake/xtensor/xtensorConfig.cmake +share/cmake/xtensor/xtensorConfigVersion.cmake +share/cmake/xtensor/xtensorTargets.cmake +share/pkgconfig/xtensor.pc |