aboutsummaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authorYuri Victorovich <yuri@FreeBSD.org>2021-11-26 19:13:40 +0000
committerYuri Victorovich <yuri@FreeBSD.org>2021-11-26 22:02:38 +0000
commit21261267e8c012747d1987d84a0e00b73c92829e (patch)
treedd92d64587aea8ffcb419b0b11b75fb9dc042196 /math
parentecb11e24a73e4530cf2d0d36eb238669adcc06b5 (diff)
downloadports-21261267e8c012747d1987d84a0e00b73c92829e.tar.gz
ports-21261267e8c012747d1987d84a0e00b73c92829e.zip
math/xtensor: Update 0.23.10 -> 0.24.0
Diffstat (limited to 'math')
-rw-r--r--math/xtensor/Makefile4
-rw-r--r--math/xtensor/distinfo6
-rw-r--r--math/xtensor/files/patch-test_CMakeLists.txt26
3 files changed, 18 insertions, 18 deletions
diff --git a/math/xtensor/Makefile b/math/xtensor/Makefile
index 248269325f16..c2de5e56e91c 100644
--- a/math/xtensor/Makefile
+++ b/math/xtensor/Makefile
@@ -1,5 +1,5 @@
PORTNAME= xtensor
-DISTVERSION= 0.23.10
+DISTVERSION= 0.24.0
CATEGORIES= math
MAINTAINER= yuri@FreeBSD.org
@@ -23,7 +23,7 @@ GH_ACCOUNT= xtensor-stack
NO_BUILD= yes
NO_ARCH= yes
-do-test: install # https://github.com/xtensor-stack/xtensor/issues/2220
+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} . && \
diff --git a/math/xtensor/distinfo b/math/xtensor/distinfo
index 9a3ab89f7956..b8c46eb404bd 100644
--- a/math/xtensor/distinfo
+++ b/math/xtensor/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621962770
-SHA256 (xtensor-stack-xtensor-0.23.10_GH0.tar.gz) = 2e770a6d636962eedc868fef4930b919e26efe783cd5d8732c11e14cf72d871c
-SIZE (xtensor-stack-xtensor-0.23.10_GH0.tar.gz) = 1180888
+TIMESTAMP = 1637953654
+SHA256 (xtensor-stack-xtensor-0.24.0_GH0.tar.gz) = 37738aa0865350b39f048e638735c05d78b5331073b6329693e8b8f0902df713
+SIZE (xtensor-stack-xtensor-0.24.0_GH0.tar.gz) = 1189367
diff --git a/math/xtensor/files/patch-test_CMakeLists.txt b/math/xtensor/files/patch-test_CMakeLists.txt
index 05183c82d5f0..8af92f7ff4c5 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 2020-11-08 16:48:28 UTC
+--- test/CMakeLists.txt.orig 2021-10-18 16:59:30 UTC
+++ test/CMakeLists.txt
-@@ -14,8 +14,8 @@ if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR
+@@ -17,8 +17,8 @@ if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR
enable_testing()
@@ -11,28 +11,28 @@
endif ()
if(NOT CMAKE_BUILD_TYPE)
-@@ -296,7 +296,7 @@ foreach(filename IN LISTS COMMON_BASE XTENSOR_TESTS)
- add_dependencies(${targetname} gtest_main)
+@@ -272,7 +272,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})
-- target_link_libraries(${targetname} PRIVATE xtensor GTest::GTest GTest::Main ${CMAKE_THREAD_LIBS_INIT})
-+ target_link_libraries(${targetname} PRIVATE GTest::GTest GTest::Main ${CMAKE_THREAD_LIBS_INIT})
+- target_link_libraries(${targetname} PRIVATE xtensor doctest::doctest ${CMAKE_THREAD_LIBS_INIT})
++ target_link_libraries(${targetname} PRIVATE doctest::doctest ${CMAKE_THREAD_LIBS_INIT})
add_custom_target(
x${targetname}
COMMAND ${targetname}
-@@ -326,7 +326,7 @@ if(DOWNLOAD_GTEST OR GTEST_SRC_DIR)
+@@ -298,7 +298,7 @@ if(XTENSOR_USE_OPENMP)
endif()
target_include_directories(test_xtensor_lib PRIVATE ${XTENSOR_INCLUDE_DIR})
--target_link_libraries(test_xtensor_lib PRIVATE xtensor GTest::GTest GTest::Main ${CMAKE_THREAD_LIBS_INIT})
-+target_link_libraries(test_xtensor_lib PRIVATE GTest::GTest GTest::Main ${CMAKE_THREAD_LIBS_INIT})
+-target_link_libraries(test_xtensor_lib PRIVATE xtensor doctest::doctest ${CMAKE_THREAD_LIBS_INIT})
++target_link_libraries(test_xtensor_lib PRIVATE doctest::doctest ${CMAKE_THREAD_LIBS_INIT})
add_custom_target(xtest COMMAND test_xtensor_lib DEPENDS test_xtensor_lib)
add_test(NAME xtest COMMAND test_xtensor_lib)
-@@ -341,5 +341,5 @@ if(DOWNLOAD_GTEST OR GTEST_SRC_DIR)
- add_dependencies(test_xtensor_core_lib gtest_main)
- endif()
+@@ -309,5 +309,5 @@ add_test(NAME xtest COMMAND test_xtensor_lib)
+ add_library(test_xtensor_core_lib ${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 GTest::GTest GTest::Main ${CMAKE_THREAD_LIBS_INIT})
+-target_link_libraries(test_xtensor_core_lib PRIVATE xtensor doctest::doctest ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(test_xtensor_core_lib PRIVATE GTest::GTest GTest::Main ${CMAKE_THREAD_LIBS_INIT})
add_custom_target(coverity COMMAND coverity_scan DEPENDS test_xtensor_core_lib)