diff options
Diffstat (limited to 'dev-cpp/cpp-taskflow')
7 files changed, 114 insertions, 196 deletions
diff --git a/dev-cpp/cpp-taskflow/Manifest b/dev-cpp/cpp-taskflow/Manifest index 59113d5cc7b0..7204301b23c0 100644 --- a/dev-cpp/cpp-taskflow/Manifest +++ b/dev-cpp/cpp-taskflow/Manifest @@ -1,7 +1,4 @@ -AUX cpp-taskflow-2.4.0-do_not_compile_examples.patch 2634 BLAKE2B 6b326b97e721061892abe0e01bcfb49dffea91b641684b1c860c8f8384153103107d9ab26dfaa4b577897e49f45fa2a6cfaaf5cf49409afa429b5dd0c7aefda9 SHA512 21b61ba80536cf8baa24c67e35902b66fb98408f86be8a4611b15304525c2e14a20af80507ccdd4d6a365303abdc38d1d199f1888baa0a35a04483a837ddadd5 -AUX cpp-taskflow-2.4.0-fix_installation_path.patch 739 BLAKE2B 6cf25c76b91d3e60c7a9f35bcf0d5a89f28dd42efb32c3fa57eefd9b716e9905d20cd8becc0a47cf74f992bf2e77b6051034f62533dbfdab4b57a70a4b24eecf SHA512 36e2284da55eba9ca24a34e8baa105a28e411d54927378f6978c96c19af08a760fc4f3caff6ec4f325d63ca8974e7b66e27e3c69ba39e22f6b8e67d3ae303b24 -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 -EBUILD cpp-taskflow-2.4.0-r1.ebuild 603 BLAKE2B 0620b659d11e94d1fde1e6f53767a98aded76fc8f7b2af238e0ff4a900484dbae00a288e12bce48a4c3adde8ced548dcef577528473328408e93219b1e49ebb3 SHA512 fd5822c2ff54904142ebf6fc5c36f263ce16178d6b161aa412dad4cb378f9e9449943e2a836cc815c9e3d6ef4f4f32bed6ef86ae0f712689cc81bb2cc4b9887f -EBUILD cpp-taskflow-2.6.0.ebuild 873 BLAKE2B 61b2318d8380aaabf27a8965bf5759b90d8941d9c7cb183273141d462fc4cfc0d41b705fc5a69537d5154325298634dde3808a207ea0bca29f49b230e589bf47 SHA512 914ad99f49f82aa63a8a700ac4c9e6bd6f0e9af0b0e90a651f7d02fb0b180fd5b1e359b8b9fbab7557a0ca242c9440a9384d66d7a9ee5ad1c0291fcb4eed033a +AUX cpp-taskflow-3.0.0-gnuinstalldir.patch 3340 BLAKE2B 2e36ea275ff93b12189e14d9a9e4a7141fb0b183ab68ce8fd76336feee34150a8f36d07bfd0eee41df04654968ae4c8de2e45df0d5de73e7e5b49f36de61a1b8 SHA512 f42539ec5612920112f7e56b7300cdee2efd8c6e93167d410b66bdacd6c827c09220162e6217fb22163ed152a364f68f16c9f255157436cc9086efcfb67ad722 +DIST cpp-taskflow-3.0.0.tar.gz 79242171 BLAKE2B 18a89fbc2dc8d37ed03a3b1002b7803c37cfa9b6f3bd6a29e53756165971ec557e2ba60b72417f400f0b1c5fe12a0d8b88ada109abc539838b7d5eb1c10f6237 SHA512 5c838ff4436ade1f3755eb6859f724188be2bfcd11baf172413a0bdc18bc516b7b911e6d83a140c95548f844a8c8b908992bdec10b3b6569876a3e3b2d5b821e +EBUILD cpp-taskflow-3.0.0.ebuild 692 BLAKE2B 403c306382a21a930d1de638ae95fca69ea983a3a69eb530e35b0e89a4905b16cc2bd639df2bcfdbba6d04f855d2eb178faebbe2411ea443b66d2aa78ef7c68f SHA512 2ab540db996797b44c9fbf64a6a84f7cdf33b51243f822f4b4b0a42511ccb603fecaae63253b990701324e47824e572d1c448c22328653abf22afc59cc716d01 MISC metadata.xml 662 BLAKE2B 9a3c9f4208ed92f0957323e281cedd321b9e15c15af231eeca1b88b8e0d87df81a546afd8877f496151c0815cb566d9e205fe1eb8b8fce33114435e2c66f75ab SHA512 9b0b6de9d422df44507429af356aa0d31411a564efe4a58065cdff38845f1e1e53fef6aef8a8537ccfff8ee36e3e77beff65aca3bda4efb2a5f3166c41ea68d2 diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0-r1.ebuild b/dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0-r1.ebuild deleted file mode 100644 index b3df053c1da1..000000000000 --- a/dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils - -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="doc" - -RDEPEND="" -DEPEND="" - -PATCHES=( - "${FILESDIR}"/${P}-do_not_compile_examples.patch - "${FILESDIR}"/${P}-fix_installation_path.patch -) - -HTML_DOCS=( docs/. ) - -src_install() { - cmake-utils_src_install - - if $(use doc); then - einstalldocs - fi -} diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-2.6.0.ebuild b/dev-cpp/cpp-taskflow/cpp-taskflow-2.6.0.ebuild deleted file mode 100644 index aba4692adef3..000000000000 --- a/dev-cpp/cpp-taskflow/cpp-taskflow-2.6.0.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils - -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="doc" - -RDEPEND="" -DEPEND="" - -S="${WORKDIR}/taskflow-${PV}" - -PATCHES=( -) - -HTML_DOCS=( docs/. ) - -src_prepare() { - default - - # fix library directoy - sed -i "s#/lib#/$(get_libdir)#g" CMakeLists.txt || die "sed failed" - - cmake-utils_src_prepare -} - -src_configure() { - # FIXME: enable CUDA and TESTS via use flag - local mycmakeargs=( - -DTF_BUILD_CUDA=OFF - -DTF_BUILD_TESTS=OFF - -DTF_BUILD_EXAMPLES=OFF - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - if $(use doc); then - einstalldocs - fi -} 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-2.4.0-do_not_compile_examples.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-do_not_compile_examples.patch deleted file mode 100644 index 99f4658adfe4..000000000000 --- a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-do_not_compile_examples.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1bf8ed3..190dabe 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -223,76 +223,10 @@ target_include_directories(${PROJECT_NAME} INTERFACE - $<INSTALL_INTERFACE:include/> - ) - --# ----------------------------------------------------------------------------- --# Example program --# ----------------------------------------------------------------------------- -- --message(STATUS "Building examples ...") --set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TF_EXAMPLE_DIR}) -- --add_executable(simple ${TF_EXAMPLE_DIR}/simple.cpp) --target_link_libraries( -- simple ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --add_executable(observer ${TF_EXAMPLE_DIR}/observer.cpp) --target_link_libraries( -- observer ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --add_executable(subflow ${TF_EXAMPLE_DIR}/subflow.cpp) --target_link_libraries( -- subflow ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --add_executable(condition ${TF_EXAMPLE_DIR}/condition.cpp) --target_link_libraries( -- condition ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --add_executable(visualization ${TF_EXAMPLE_DIR}/visualization.cpp) --target_link_libraries( -- visualization ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --add_executable(reduce ${TF_EXAMPLE_DIR}/reduce.cpp) --target_link_libraries( -- reduce ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --add_executable(parallel_for ${TF_EXAMPLE_DIR}/parallel_for.cpp) --target_link_libraries( -- parallel_for ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --add_executable(run ${TF_EXAMPLE_DIR}/run.cpp) --target_link_libraries( -- run ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --add_executable(composition ${TF_EXAMPLE_DIR}/composition.cpp) --target_link_libraries( -- composition ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --#### CUDA examples --if(${TF_ENABLE_CUDA}) --set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TF_EXAMPLE_DIR}/cuda) -- --add_executable(saxpy ${TF_EXAMPLE_DIR}/cuda/saxpy.cu) --target_link_libraries( -- saxpy ${PROJECT_NAME} Threads::Threads tf::default_settings --) -- --add_executable(device_property ${TF_EXAMPLE_DIR}/cuda/device_property.cu) --target_link_libraries( -- device_property ${PROJECT_NAME} Threads::Threads tf::default_settings --) --endif(${TF_ENABLE_CUDA}) -- - # ----------------------------------------------------------------------------- - # Unittest - # ----------------------------------------------------------------------------- -+ - enable_testing() - message(STATUS "Building unit tests ...") - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TF_UTEST_DIR}) diff --git a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-fix_installation_path.patch b/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-fix_installation_path.patch deleted file mode 100644 index f68e572f5ab2..000000000000 --- a/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-fix_installation_path.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 190dabe..6d613d6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,7 +6,7 @@ MESSAGE(STATUS "CMAKE_ROOT: " ${CMAKE_ROOT}) - #_cmake_modify_IGNORE set(CMAKE_VERBOSE_MAKEFILE ON) - - # Project name --project(Cpp-Taskflow VERSION 2.3.1 LANGUAGES CXX) -+project(Cpp-Taskflow VERSION 2.4.0 LANGUAGES CXX) - - # build options - option(TF_ENABLE_CUDA "Enables build of cuda code" OFF) -@@ -748,7 +748,7 @@ 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 -+ DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} - ) - - 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) |