[gentoo-commits] repo/gentoo:master commit in: dev-cpp/cpp-taskflow/, dev-cpp/cpp-taskflow/files/
commit: 85b45a5b1bfeb0943531b0c9b2a1823f1cc9cd7b
Author: Jakov Smolić gentoo org>
AuthorDate: Mon Oct 4 08:09:53 2021 +
Commit: Jakov Smolić gentoo org>
CommitDate: Mon Oct 4 09:03:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85b45a5b
dev-cpp/cpp-taskflow: Remove old 3.0.0
Signed-off-by: Jakov Smolić gentoo.org>
dev-cpp/cpp-taskflow/Manifest | 1 -
dev-cpp/cpp-taskflow/cpp-taskflow-3.0.0.ebuild | 32 -
.../files/cpp-taskflow-3.0.0-gnuinstalldir.patch | 79 --
3 files changed, 112 deletions(-)
diff --git a/dev-cpp/cpp-taskflow/Manifest b/dev-cpp/cpp-taskflow/Manifest
index 73264f6bfc3..3a4c979f17c 100644
--- a/dev-cpp/cpp-taskflow/Manifest
+++ b/dev-cpp/cpp-taskflow/Manifest
@@ -1,2 +1 @@
-DIST cpp-taskflow-3.0.0.tar.gz 79242171 BLAKE2B
18a89fbc2dc8d37ed03a3b1002b7803c37cfa9b6f3bd6a29e53756165971ec557e2ba60b72417f400f0b1c5fe12a0d8b88ada109abc539838b7d5eb1c10f6237
SHA512
5c838ff4436ade1f3755eb6859f724188be2bfcd11baf172413a0bdc18bc516b7b911e6d83a140c95548f844a8c8b908992bdec10b3b6569876a3e3b2d5b821e
DIST cpp-taskflow-3.2.0.tar.gz 79152157 BLAKE2B
03b4b1cf772c9dec4557a706c7872de95312d4e72ec7dcef1accfd1d5eaf470e60440d75ea0c993ab494ef460dc44639719ea1732fa92c54d64dde31b90b9224
SHA512
e30d95b69f64524c9b06cf7442236998f91b1083818f06439888d78d5a1b988bc952c02fd0ec88114283cbe6c31a7bbfe810a7114998f4b5f60c4cff921bb0fa
diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-3.0.0.ebuild
b/dev-cpp/cpp-taskflow/cpp-taskflow-3.0.0.ebuild
deleted file mode 100644
index ee708046e37..000
--- a/dev-cpp/cpp-taskflow/cpp-taskflow-3.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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
deleted file mode 100644
index 8e974f2f826..000
--- a/dev-cpp/cpp-taskflow/files/cpp-taskflow-3.0.0-gnuinstalldir.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-https://github.com/taskflow/taskflow/pull/280
-Author: David Seifert
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_DI
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/cpp-taskflow/, dev-cpp/cpp-taskflow/files/
commit: f2b2889067305d38cb8a00598c0c2d56d04f7f1c
Author: Jakov Smolic sartura hr>
AuthorDate: Sun Jan 24 13:48:13 2021 +
Commit: David Seifert gentoo org>
CommitDate: Sun Jan 24 13:48:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2b28890
dev-cpp/cpp-taskflow: Remove old
Closes: https://github.com/gentoo/gentoo/pull/19174
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
dev-cpp/cpp-taskflow/Manifest | 2 -
dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0-r1.ebuild | 33 -
dev-cpp/cpp-taskflow/cpp-taskflow-2.6.0.ebuild | 53 --
...pp-taskflow-2.4.0-do_not_compile_examples.patch | 82 --
.../cpp-taskflow-2.4.0-fix_installation_path.patch | 22 --
5 files changed, 192 deletions(-)
diff --git a/dev-cpp/cpp-taskflow/Manifest b/dev-cpp/cpp-taskflow/Manifest
index dc4673ee858..d9afaa56ca8 100644
--- a/dev-cpp/cpp-taskflow/Manifest
+++ b/dev-cpp/cpp-taskflow/Manifest
@@ -1,3 +1 @@
-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-2.4.0-r1.ebuild
b/dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0-r1.ebuild
deleted file mode 100644
index b3df053c1da..000
--- 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 aba4692adef..000
--- 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/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 99f4658adfe..000
---
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
- $
- )
-
--#
-
--# Example program
--#
-
--
--message(STATUS "Building exam
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/cpp-taskflow/, dev-cpp/cpp-taskflow/files/
commit: d8c4c8e754d02129e8a850690fd95f0ee41d4e5b
Author: Matthias Maier gentoo org>
AuthorDate: Sat May 23 07:33:24 2020 +
Commit: Matthias Maier gentoo org>
CommitDate: Mon May 25 03:05:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8c4c8e7
dev-cpp/cpp-taskflow: also install cmake project configuration
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Matthias Maier gentoo.org>
...w-2.4.0.ebuild => cpp-taskflow-2.4.0-r1.ebuild} | 10 ++-
...pp-taskflow-2.4.0-do_not_compile_examples.patch | 82 ++
.../cpp-taskflow-2.4.0-fix_installation_path.patch | 22 ++
3 files changed, 112 insertions(+), 2 deletions(-)
diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0.ebuild
b/dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0-r1.ebuild
similarity index 73%
rename from dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0.ebuild
rename to dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0-r1.ebuild
index a41d2610143..b3df053c1da 100644
--- a/dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0.ebuild
+++ b/dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0-r1.ebuild
@@ -3,6 +3,8 @@
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"
@@ -15,11 +17,15 @@ IUSE="doc"
RDEPEND=""
DEPEND=""
+PATCHES=(
+ "${FILESDIR}"/${P}-do_not_compile_examples.patch
+ "${FILESDIR}"/${P}-fix_installation_path.patch
+)
+
HTML_DOCS=( docs/. )
src_install() {
- insinto /usr/include
- doins -r taskflow
+ cmake-utils_src_install
if $(use doc); then
einstalldocs
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
new file mode 100644
index 000..99f4658adfe
--- /dev/null
+++
b/dev-cpp/cpp-taskflow/files/cpp-taskflow-2.4.0-do_not_compile_examples.patch
@@ -0,0 +1,82 @@
+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
+ $
+ )
+
+-#
-
+-# 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
new file mode 100644
index 000..f68e572f5ab
--- /dev/null
+++ b/dev-cpp/cpp-taskflow/files
