1 |
commit: 85b45a5b1bfeb0943531b0c9b2a1823f1cc9cd7b |
2 |
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 4 08:09:53 2021 +0000 |
4 |
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 4 09:03:12 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85b45a5b |
7 |
|
8 |
dev-cpp/cpp-taskflow: Remove old 3.0.0 |
9 |
|
10 |
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> |
11 |
|
12 |
dev-cpp/cpp-taskflow/Manifest | 1 - |
13 |
dev-cpp/cpp-taskflow/cpp-taskflow-3.0.0.ebuild | 32 --------- |
14 |
.../files/cpp-taskflow-3.0.0-gnuinstalldir.patch | 79 ---------------------- |
15 |
3 files changed, 112 deletions(-) |
16 |
|
17 |
diff --git a/dev-cpp/cpp-taskflow/Manifest b/dev-cpp/cpp-taskflow/Manifest |
18 |
index 73264f6bfc3..3a4c979f17c 100644 |
19 |
--- a/dev-cpp/cpp-taskflow/Manifest |
20 |
+++ b/dev-cpp/cpp-taskflow/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST cpp-taskflow-3.0.0.tar.gz 79242171 BLAKE2B 18a89fbc2dc8d37ed03a3b1002b7803c37cfa9b6f3bd6a29e53756165971ec557e2ba60b72417f400f0b1c5fe12a0d8b88ada109abc539838b7d5eb1c10f6237 SHA512 5c838ff4436ade1f3755eb6859f724188be2bfcd11baf172413a0bdc18bc516b7b911e6d83a140c95548f844a8c8b908992bdec10b3b6569876a3e3b2d5b821e |
23 |
DIST cpp-taskflow-3.2.0.tar.gz 79152157 BLAKE2B 03b4b1cf772c9dec4557a706c7872de95312d4e72ec7dcef1accfd1d5eaf470e60440d75ea0c993ab494ef460dc44639719ea1732fa92c54d64dde31b90b9224 SHA512 e30d95b69f64524c9b06cf7442236998f91b1083818f06439888d78d5a1b988bc952c02fd0ec88114283cbe6c31a7bbfe810a7114998f4b5f60c4cff921bb0fa |
24 |
|
25 |
diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-3.0.0.ebuild b/dev-cpp/cpp-taskflow/cpp-taskflow-3.0.0.ebuild |
26 |
deleted file mode 100644 |
27 |
index ee708046e37..00000000000 |
28 |
--- a/dev-cpp/cpp-taskflow/cpp-taskflow-3.0.0.ebuild |
29 |
+++ /dev/null |
30 |
@@ -1,32 +0,0 @@ |
31 |
-# Copyright 1999-2021 Gentoo Authors |
32 |
-# Distributed under the terms of the GNU General Public License v2 |
33 |
- |
34 |
-EAPI=7 |
35 |
- |
36 |
-inherit cmake |
37 |
- |
38 |
-DESCRIPTION="Modern C++ Parallel Task Programming" |
39 |
-HOMEPAGE="https://cpp-taskflow.github.io" |
40 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
41 |
- |
42 |
-LICENSE="MIT" |
43 |
-SLOT="0" |
44 |
-KEYWORDS="~amd64 ~x86" |
45 |
-IUSE="examples test" |
46 |
-RESTRICT="!test? ( test )" |
47 |
- |
48 |
-PATCHES=( "${FILESDIR}"/${P}-gnuinstalldir.patch ) |
49 |
- |
50 |
-S="${WORKDIR}/taskflow-${PV}" |
51 |
-HTML_DOCS=( docs/. ) |
52 |
- |
53 |
-src_configure() { |
54 |
- # TODO: enable CUDA via USE flag |
55 |
- local mycmakeargs=( |
56 |
- -DTF_BUILD_CUDA=OFF |
57 |
- -DTF_BUILD_EXAMPLES=$(usex examples) |
58 |
- -DTF_BUILD_TESTS=$(usex test) |
59 |
- ) |
60 |
- |
61 |
- cmake_src_configure |
62 |
-} |
63 |
|
64 |
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 |
65 |
deleted file mode 100644 |
66 |
index 8e974f2f826..00000000000 |
67 |
--- a/dev-cpp/cpp-taskflow/files/cpp-taskflow-3.0.0-gnuinstalldir.patch |
68 |
+++ /dev/null |
69 |
@@ -1,79 +0,0 @@ |
70 |
-https://github.com/taskflow/taskflow/pull/280 |
71 |
-Author: David Seifert <soap@g.o> |
72 |
---- a/CMakeLists.txt |
73 |
-+++ b/CMakeLists.txt |
74 |
-@@ -29,6 +29,9 @@ set(CMAKE_VERBOSE_MAKEFILE ON) |
75 |
- # Include additional language check |
76 |
- include(CheckLanguage) |
77 |
- |
78 |
-+# Adhere to GNU conventions |
79 |
-+include(GNUInstallDirs) |
80 |
-+ |
81 |
- # Compiler vendors |
82 |
- ## g++ |
83 |
- if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") |
84 |
-@@ -244,6 +247,8 @@ message(STATUS "CMAKE_CURRENT_BINARY_DIR: " ${CMAKE_CURRENT_BINARY_DIR}) |
85 |
- message(STATUS "CMAKE_CURRENT_LIST_DIR: " ${CMAKE_CURRENT_LIST_DIR}) |
86 |
- message(STATUS "CMAKE_EXE_LINKER_FLAGS: " ${CMAKE_EXE_LINKER_FLAGS}) |
87 |
- message(STATUS "CMAKE_INSTALL_PREFIX: " ${CMAKE_INSTALL_PREFIX}) |
88 |
-+message(STATUS "CMAKE_INSTALL_FULL_INCLUDEDIR: " ${CMAKE_INSTALL_FULL_INCLUDEDIR}) |
89 |
-+message(STATUS "CMAKE_INSTALL_FULL_LIBDIR: " ${CMAKE_INSTALL_FULL_LIBDIR}) |
90 |
- message(STATUS "CMAKE_MODULE_PATH: " ${CMAKE_MODULE_PATH}) |
91 |
- message(STATUS "CMAKE_PREFIX_PATH: " ${CMAKE_PREFIX_PATH}) |
92 |
- message(STATUS "TF_BUILD_BENCHMARKS: " ${TF_BUILD_BENCHMARKS}) |
93 |
-@@ -252,8 +257,6 @@ message(STATUS "TF_BUILD_SYCL: " ${TF_BUILD_SYCL}) |
94 |
- message(STATUS "TF_BUILD_TESTS: " ${TF_BUILD_TESTS}) |
95 |
- message(STATUS "TF_BUILD_EXAMPLES: " ${TF_BUILD_EXAMPLES}) |
96 |
- message(STATUS "TF_BUILD_PROFILER: " ${TF_BUILD_PROFILER}) |
97 |
--message(STATUS "TF_INC_INSTALL_DIR: " ${TF_INC_INSTALL_DIR}) |
98 |
--message(STATUS "TF_LIB_INSTALL_DIR: " ${TF_LIB_INSTALL_DIR}) |
99 |
- message(STATUS "TF_UTEST_DIR: " ${TF_UTEST_DIR}) |
100 |
- message(STATUS "TF_EXAMPLE_DIR: " ${TF_EXAMPLE_DIR}) |
101 |
- message(STATUS "TF_BENCHMARK_DIR: " ${TF_BENCHMARK_DIR}) |
102 |
-@@ -334,7 +337,7 @@ endif(TF_BUILD_BENCHMARKS) |
103 |
- # ----------------------------------------------------------------------------- |
104 |
- |
105 |
- # install header |
106 |
--install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/taskflow DESTINATION ${TF_INC_INSTALL_DIR}) |
107 |
-+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/taskflow DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) |
108 |
- |
109 |
- # export target |
110 |
- set_target_properties(${PROJECT_NAME} PROPERTIES EXPORT_NAME ${PROJECT_NAME}) |
111 |
-@@ -350,7 +353,7 @@ install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets) |
112 |
- install( |
113 |
- EXPORT ${PROJECT_NAME}Targets |
114 |
- NAMESPACE ${PROJECT_NAME}:: |
115 |
-- DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} |
116 |
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} |
117 |
- ) |
118 |
- |
119 |
- # set up config |
120 |
-@@ -359,8 +362,8 @@ include(CMakePackageConfigHelpers) |
121 |
- configure_package_config_file( |
122 |
- ${PROJECT_NAME}Config.cmake.in |
123 |
- ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake |
124 |
-- INSTALL_DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} |
125 |
-- PATH_VARS TF_INC_INSTALL_DIR |
126 |
-+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} |
127 |
-+ PATH_VARS CMAKE_INSTALL_FULL_INCLUDEDIR |
128 |
- ) |
129 |
- |
130 |
- write_basic_package_version_file( |
131 |
-@@ -371,6 +374,6 @@ write_basic_package_version_file( |
132 |
- install( |
133 |
- FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake |
134 |
- ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake |
135 |
-- DESTINATION ${TF_LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} |
136 |
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} |
137 |
- ) |
138 |
- |
139 |
---- a/TaskflowConfig.cmake.in |
140 |
-+++ b/TaskflowConfig.cmake.in |
141 |
-@@ -1,6 +1,6 @@ |
142 |
- @PACKAGE_INIT@ |
143 |
- |
144 |
--set_and_check(@PROJECT_NAME@_INCLUDE_DIR "@PACKAGE_TF_INC_INSTALL_DIR@") |
145 |
-+set_and_check(@PROJECT_NAME@_INCLUDE_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@") |
146 |
- |
147 |
- include(CMakeFindDependencyMacro) |
148 |
- find_dependency(Threads) |