diff options
| author | yuri <yuri@FreeBSD.org> | 2018-08-13 00:43:32 +0800 |
|---|---|---|
| committer | yuri <yuri@FreeBSD.org> | 2018-08-13 00:43:32 +0800 |
| commit | b0991494805f9aeb1c3ac7a20dd61544fc507eb5 (patch) | |
| tree | 26f400c1ef3bbf77d28aeabbc61893a1c9163157 | |
| parent | b6511d0c52e15d136363f559a23c37aa5beb2ab9 (diff) | |
| download | freebsd-ports-gnome-b0991494805f9aeb1c3ac7a20dd61544fc507eb5.tar.gz freebsd-ports-gnome-b0991494805f9aeb1c3ac7a20dd61544fc507eb5.tar.zst freebsd-ports-gnome-b0991494805f9aeb1c3ac7a20dd61544fc507eb5.zip | |
math/xtensor: Unbundle xtl
Also add devel/nlohmann-json as a dependency. It was missing.
| -rw-r--r-- | math/xtensor/Makefile | 13 | ||||
| -rw-r--r-- | math/xtensor/files/patch-CMakeLists.txt | 14 | ||||
| -rw-r--r-- | math/xtensor/pkg-plist | 21 |
3 files changed, 8 insertions, 40 deletions
diff --git a/math/xtensor/Makefile b/math/xtensor/Makefile index b0580a9c68a6..f89b00cfe269 100644 --- a/math/xtensor/Makefile +++ b/math/xtensor/Makefile @@ -2,6 +2,7 @@ PORTNAME= xtensor DISTVERSION= 0.17.1 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org @@ -10,18 +11,20 @@ COMMENT= Multi-dimensional arrays with broadcasting and lazy computing LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= googletest>0:devel/googletest +BUILD_DEPENDS= nlohmann-json>0:devel/nlohmann-json \ + xtl-quant-stack>0:devel/xtl-quant-stack +RUN_DEPENDS= nlohmann-json>0:devel/nlohmann-json \ + xtl-quant-stack>0:devel/xtl-quant-stack +TEST_DEPENDS= nlohmann-json>0:devel/nlohmann-json \ + xtl-quant-stack>0:devel/xtl-quant-stack \ + googletest>0:devel/googletest USES= cmake USE_GITHUB= yes GH_ACCOUNT= QuantStack -GH_TUPLE= QuantStack:xtl:0.4.14:xtl/xtl NO_BUILD= yes NO_ARCH= yes -post-install: - cd ${WRKSRC}/xtl/include && ${COPYTREE_SHARE} xtl ${STAGEDIR}${PREFIX}/include - do-test: @${RLN} ${STAGEDIR}${PREFIX}/include ${WRKSRC}/test/staged-include @cd ${WRKSRC}/test && \ diff --git a/math/xtensor/files/patch-CMakeLists.txt b/math/xtensor/files/patch-CMakeLists.txt deleted file mode 100644 index 0792d790dad2..000000000000 --- a/math/xtensor/files/patch-CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ ---- CMakeLists.txt.orig 2018-08-01 12:53:03 UTC -+++ CMakeLists.txt -@@ -28,9 +28,9 @@ message(STATUS "Building xtensor v${${PR - # Dependencies - # ============ - --find_package(xtl 0.4.14 REQUIRED) -+#find_package(xtl 0.4.14 REQUIRED) - --message(STATUS "Found xtl: ${xtl_INCLUDE_DIRS}/xtl") -+message(STATUS "Found xtl: xtl/include") - - find_package(nlohmann_json 3.1.1 QUIET) - diff --git a/math/xtensor/pkg-plist b/math/xtensor/pkg-plist index 5ccb346bf54f..d952e8ac6f85 100644 --- a/math/xtensor/pkg-plist +++ b/math/xtensor/pkg-plist @@ -55,27 +55,6 @@ include/xtensor/xutils.hpp include/xtensor/xvectorize.hpp include/xtensor/xview.hpp include/xtensor/xview_utils.hpp -include/xtl/xany.hpp -include/xtl/xbase64.hpp -include/xtl/xbasic_fixed_string.hpp -include/xtl/xclosure.hpp -include/xtl/xcomplex.hpp -include/xtl/xcomplex_sequence.hpp -include/xtl/xdynamic_bitset.hpp -include/xtl/xfunctional.hpp -include/xtl/xhash.hpp -include/xtl/xhierarchy_generator.hpp -include/xtl/xiterator_base.hpp -include/xtl/xjson.hpp -include/xtl/xmeta_utils.hpp -include/xtl/xoptional.hpp -include/xtl/xoptional_sequence.hpp -include/xtl/xproxy_wrapper.hpp -include/xtl/xsequence.hpp -include/xtl/xtl_config.hpp -include/xtl/xtype_traits.hpp -include/xtl/xvariant.hpp -include/xtl/xvariant_impl.hpp lib/cmake/xtensor/xtensorConfig.cmake lib/cmake/xtensor/xtensorConfigVersion.cmake lib/cmake/xtensor/xtensorTargets.cmake |