diff options
author | Jakov Smolic <jakov.smolic@sartura.hr> | 2021-01-24 14:48:12 +0100 |
---|---|---|
committer | David Seifert <soap@gentoo.org> | 2021-01-24 14:48:12 +0100 |
commit | bced17bcbe33a9bf231bff24a88815647b04e1dc (patch) | |
tree | 53d9836443e0c641c6e20ffd3a7edd232dfe07d7 /dev-cpp/cpp-taskflow | |
parent | dev-libs/botan: cleanup old (diff) | |
download | gentoo-bced17bcbe33a9bf231bff24a88815647b04e1dc.tar.gz gentoo-bced17bcbe33a9bf231bff24a88815647b04e1dc.tar.bz2 gentoo-bced17bcbe33a9bf231bff24a88815647b04e1dc.zip |
dev-cpp/cpp-taskflow: Bump to 3.0.0
Closes: https://bugs.gentoo.org/740556
Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'dev-cpp/cpp-taskflow')
-rw-r--r-- | dev-cpp/cpp-taskflow/Manifest | 1 | ||||
-rw-r--r-- | dev-cpp/cpp-taskflow/cpp-taskflow-3.0.0.ebuild | 32 | ||||
-rw-r--r-- | dev-cpp/cpp-taskflow/files/cpp-taskflow-3.0.0-gnuinstalldir.patch | 79 |
3 files changed, 112 insertions, 0 deletions
diff --git a/dev-cpp/cpp-taskflow/Manifest b/dev-cpp/cpp-taskflow/Manifest index 3af8545a82b1..dc4673ee858f 100644 --- a/dev-cpp/cpp-taskflow/Manifest +++ b/dev-cpp/cpp-taskflow/Manifest @@ -1,2 +1,3 @@ DIST cpp-taskflow-2.4.0.tar.gz 76993334 BLAKE2B 8f257165ab72dbe6c1cf6a86886669008e9f16f1dfd4871defc452bdb9dfa3e45ab9bfbbdc874b4ba566a2a7d8984a666ce2933b2c6d2215467f7fbfa03ac520 SHA512 dd6c7500e39d7058871280d12e120bd28d9609e5289f1d7851b3b59e2c1bfe74d3040d902bd5b26895e558b563c8abad878e7bc343e199e7356940c02a64217f DIST cpp-taskflow-2.6.0.tar.gz 68626469 BLAKE2B d85b1615be47c1e98e613e7875424892613205a0cc3f380f7d6fd0521045c5750441e9267382ec5282299e4074a7b85f442e53f38a2f12aff7d3d925a94b8773 SHA512 43b023c7d744ae1e0baf6f504f32da481e950ec5cc34fe5511e4bbb8905203e4726917ee103b1c02544a75c6216c2ca481034be810b61a35511a3d7a2b278133 +DIST cpp-taskflow-3.0.0.tar.gz 79242171 BLAKE2B 18a89fbc2dc8d37ed03a3b1002b7803c37cfa9b6f3bd6a29e53756165971ec557e2ba60b72417f400f0b1c5fe12a0d8b88ada109abc539838b7d5eb1c10f6237 SHA512 5c838ff4436ade1f3755eb6859f724188be2bfcd11baf172413a0bdc18bc516b7b911e6d83a140c95548f844a8c8b908992bdec10b3b6569876a3e3b2d5b821e diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-3.0.0.ebuild b/dev-cpp/cpp-taskflow/cpp-taskflow-3.0.0.ebuild new file mode 100644 index 000000000000..ee708046e377 --- /dev/null +++ b/dev-cpp/cpp-taskflow/cpp-taskflow-3.0.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Modern C++ Parallel Task Programming" +HOMEPAGE="https://cpp-taskflow.github.io" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="examples test" +RESTRICT="!test? ( test )" + +PATCHES=( "${FILESDIR}"/${P}-gnuinstalldir.patch ) + +S="${WORKDIR}/taskflow-${PV}" +HTML_DOCS=( docs/. ) + +src_configure() { + # TODO: enable CUDA via USE flag + local mycmakeargs=( + -DTF_BUILD_CUDA=OFF + -DTF_BUILD_EXAMPLES=$(usex examples) + -DTF_BUILD_TESTS=$(usex test) + ) + + cmake_src_configure +} diff --git a/dev-cpp/cpp-taskflow/files/cpp-taskflow-3.0.0-gnuinstalldir.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-3.0.0-gnuinstalldir.patch new file mode 100644 index 000000000000..8e974f2f8269 --- /dev/null +++ b/dev-cpp/cpp-taskflow/files/cpp-taskflow-3.0.0-gnuinstalldir.patch @@ -0,0 +1,79 @@ +https://github.com/taskflow/taskflow/pull/280 +Author: David Seifert <soap@gentoo.org> +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -29,6 +29,9 @@ set(CMAKE_VERBOSE_MAKEFILE ON) + # Include additional language check + include(CheckLanguage) + ++# Adhere to GNU conventions ++include(GNUInstallDirs) ++ + # Compiler vendors + ## g++ + if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +@@ -244,6 +247,8 @@ message(STATUS "CMAKE_CURRENT_BINARY_DIR: " ${CMAKE_CURRENT_BINARY_DIR}) + message(STATUS "CMAKE_CURRENT_LIST_DIR: " ${CMAKE_CURRENT_LIST_DIR}) + message(STATUS "CMAKE_EXE_LINKER_FLAGS: " ${CMAKE_EXE_LINKER_FLAGS}) + message(STATUS "CMAKE_INSTALL_PREFIX: " ${CMAKE_INSTALL_PREFIX}) ++message(STATUS "CMAKE_INSTALL_FULL_INCLUDEDIR: " ${CMAKE_INSTALL_FULL_INCLUDEDIR}) ++message(STATUS "CMAKE_INSTALL_FULL_LIBDIR: " ${CMAKE_INSTALL_FULL_LIBDIR}) + message(STATUS "CMAKE_MODULE_PATH: " ${CMAKE_MODULE_PATH}) + message(STATUS "CMAKE_PREFIX_PATH: " ${CMAKE_PREFIX_PATH}) + message(STATUS "TF_BUILD_BENCHMARKS: " ${TF_BUILD_BENCHMARKS}) +@@ -252,8 +257,6 @@ message(STATUS "TF_BUILD_SYCL: " ${TF_BUILD_SYCL}) + message(STATUS "TF_BUILD_TESTS: " ${TF_BUILD_TESTS}) + message(STATUS "TF_BUILD_EXAMPLES: " ${TF_BUILD_EXAMPLES}) + message(STATUS "TF_BUILD_PROFILER: " ${TF_BUILD_PROFILER}) +-message(STATUS "TF_INC_INSTALL_DIR: " ${TF_INC_INSTALL_DIR}) +-message(STATUS "TF_LIB_INSTALL_DIR: " ${TF_LIB_INSTALL_DIR}) + message(STATUS "TF_UTEST_DIR: " ${TF_UTEST_DIR}) + message(STATUS "TF_EXAMPLE_DIR: " ${TF_EXAMPLE_DIR}) + message(STATUS "TF_BENCHMARK_DIR: " ${TF_BENCHMARK_DIR}) +@@ -334,7 +337,7 @@ endif(TF_BUILD_BENCHMARKS) + # ----------------------------------------------------------------------------- + + # install header +-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/taskflow DESTINATION ${TF_INC_INSTALL_DIR}) ++install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/taskflow DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + + # export target + set_target_properties(${PROJECT_NAME} PROPERTIES EXPORT_NAME ${PROJECT_NAME}) +@@ -350,7 +353,7 @@ install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets) + install( + EXPORT ${PROJECT_NAME}Targets + NAMESPACE ${PROJECT_NAME}:: +- DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} + ) + + # set up config +@@ -359,8 +362,8 @@ include(CMakePackageConfigHelpers) + configure_package_config_file( + ${PROJECT_NAME}Config.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake +- INSTALL_DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} +- PATH_VARS TF_INC_INSTALL_DIR ++ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++ PATH_VARS CMAKE_INSTALL_FULL_INCLUDEDIR + ) + + write_basic_package_version_file( +@@ -371,6 +374,6 @@ write_basic_package_version_file( + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake +- DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} + ) + +--- a/TaskflowConfig.cmake.in ++++ b/TaskflowConfig.cmake.in +@@ -1,6 +1,6 @@ + @PACKAGE_INIT@ + +-set_and_check(@PROJECT_NAME@_INCLUDE_DIR "@PACKAGE_TF_INC_INSTALL_DIR@") ++set_and_check(@PROJECT_NAME@_INCLUDE_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@") + + include(CMakeFindDependencyMacro) + find_dependency(Threads) |