Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/releases/17.0/, profiles/, dev-util/nvidia-cuda-sdk/
Date: Fri, 24 Sep 2021 09:26:30
Message-Id: 1632475569.045f9c6249b6597ab50e879db9196e7158f51001.soap@gentoo
1 commit: 045f9c6249b6597ab50e879db9196e7158f51001
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 24 09:26:09 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 24 09:26:09 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=045f9c62
7
8 dev-util/nvidia-cuda-sdk: drop 8.0.61-r1, 9.2.88-r1
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12 dev-util/nvidia-cuda-sdk/Manifest | 2 -
13 .../nvidia-cuda-sdk-8.0.61-r1.ebuild | 140 ---------------------
14 .../nvidia-cuda-sdk-9.2.88-r1.ebuild | 140 ---------------------
15 profiles/package.mask | 1 -
16 profiles/releases/17.0/package.mask | 1 -
17 5 files changed, 284 deletions(-)
18
19 diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest
20 index 6ecb53f880f..e80c872ce2f 100644
21 --- a/dev-util/nvidia-cuda-sdk/Manifest
22 +++ b/dev-util/nvidia-cuda-sdk/Manifest
23 @@ -1,3 +1 @@
24 DIST cuda_10.2.89_440.33.01_linux.run 2645419389 BLAKE2B 236aa70a7b45e3636c2c229fffa7d1ca0699ab4365865a73edab607a209c42c2899133dd6a83c61c5929fa754668ad15aec4d847639af1c00a8e6657c8487c77 SHA512 ad8da539ff5df7caf411d1e497ff3d6978cfa8a1fd9150fa4846089e92a604ea56be8631f3efdfe7229a655b8d2d28e6edb32f5731530a77d6f00241cc7aab6e
25 -DIST cuda_8.0.61_375.26_linux.run 1465528129 BLAKE2B d52ddf1dcf5246f230f210d10d1f6e7b540c892dea5a8cd770f0d062b30b01f5c8467d930430b383464d40a9b4a14eaaf22a365e081955e4452ec4f55e08da0b SHA512 d22303719a9feff64f95bf6a966f1caa2bf0cf8c955e475ce08ce54faa5e098d336c2db223ef0185c1f23b9c52b7d2f81a63515485219cfc016d72bda979248b
26 -DIST cuda_9.2.88_396.26_linux.run 1758421686 BLAKE2B 5068b2dfae87e43c124a6a72ac98b7c562aebc7161e7c977cfba68342127e99705228be531aa5bb8af0318e17c4ef8fe36257452d0f507fc3b82e3fbd0184bdc SHA512 2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba
27
28 diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.61-r1.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.61-r1.ebuild
29 deleted file mode 100644
30 index aae721c174c..00000000000
31 --- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.61-r1.ebuild
32 +++ /dev/null
33 @@ -1,140 +0,0 @@
34 -# Copyright 1999-2021 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -
39 -inherit cuda flag-o-matic portability toolchain-funcs unpacker
40 -
41 -MYD=$(ver_cut 1-2 ${PV})
42 -DRIVER_PV="375.26"
43 -
44 -DESCRIPTION="NVIDIA CUDA Software Development Kit"
45 -HOMEPAGE="https://developer.nvidia.com/cuda-zone"
46 -SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod2/local_installers/cuda_${PV}_${DRIVER_PV}_linux-run -> cuda_${PV}_${DRIVER_PV}_linux.run"
47 -
48 -LICENSE="CUDPP"
49 -SLOT="0"
50 -KEYWORDS="~amd64 ~amd64-linux"
51 -IUSE="+cuda debug +doc +examples opencl mpi"
52 -
53 -RDEPEND="
54 - ~dev-util/nvidia-cuda-toolkit-${PV}
55 - media-libs/freeglut
56 - examples? (
57 - media-libs/freeimage
58 - media-libs/glew:0=
59 - >=x11-drivers/nvidia-drivers-375.26[uvm(+)]
60 - mpi? ( virtual/mpi )
61 - )"
62 -DEPEND="${RDEPEND}"
63 -BDEPEND="virtual/pkgconfig"
64 -
65 -RESTRICT="test"
66 -
67 -S=${WORKDIR}/samples
68 -
69 -QA_EXECSTACK=(
70 - opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
71 - opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
72 - opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
73 - opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
74 - )
75 -
76 -src_unpack() {
77 - # We first need to unpack the cuda_${PV}_linux.run file
78 - # which includes the cuda-samples*run file.
79 - unpacker
80 - unpacker run_files/cuda-samples*run
81 -}
82 -
83 -src_prepare() {
84 - cuda_src_prepare
85 -
86 - export RAWLDFLAGS="$(raw-ldflags)"
87 -
88 - local file
89 - while IFS="" read -d $'\0' -r file; do
90 - sed \
91 - -e 's:-O[23]::g' \
92 - -e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
93 - -e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
94 - -e "/CC/s:gcc:$(tc-getCC):g" \
95 - -e "/GCC/s:g++:$(tc-getCXX):g" \
96 - -e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
97 - -e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
98 - -e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
99 - -e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
100 - -e 's:-Wimplicit::g' \
101 - -e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
102 - -e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
103 - -e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
104 - -i "${file}" || die
105 - # -e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
106 - done < <(find . -type f -name 'Makefile' -print0)
107 -
108 - rm -rf common/inc/GL || die
109 - find . -type f -name '*.a' -delete || die
110 -
111 - eapply_user
112 -}
113 -
114 -src_compile() {
115 - use examples || return
116 - local myopts=("verbose=1")
117 - use debug && myopts+=("dbg=1")
118 - export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
119 - emake \
120 - cuda-install="${EPREFIX}/opt/cuda" \
121 - CUDA_PATH="${EPREFIX}/opt/cuda/" \
122 - MPI_GCC=10 \
123 - "${myopts[@]}"
124 -}
125 -
126 -src_test() {
127 - addwrite /dev/nvidiactl
128 - addwrite /dev/nvidia0
129 -
130 - local i
131 - for i in {0..9}*/*; do
132 - emake -C "${i}" run
133 - done
134 -}
135 -
136 -src_install() {
137 - local f t crap=( *.txt Samples.htm* )
138 -
139 - if use doc; then
140 - ebegin "Installing docs ..."
141 - while IFS="" read -d $'\0' -r f; do
142 - treecopy "${f}" "${ED}"/usr/share/doc/${PF}/
143 - done < <(find -type f \( -name 'readme.txt' -o -name '*.pdf' \) -print0)
144 -
145 - while IFS="" read -d $'\0' -r f; do
146 - docompress -x "${f#${ED}}"
147 - done < <(find "${ED}"/usr/share/doc/${PF}/ -type f -name 'readme.txt' -print0)
148 - eend
149 - fi
150 -
151 - ebegin "Cleaning before installation..."
152 - for f in "${crap[@]}"; do
153 - rm -f "${f}" || die
154 - done
155 - find -type f \( -name '*.o' -o -name '*.pdf' -o -name 'readme.txt' \) -delete || die
156 - eend
157 -
158 - ebegin "Moving files..."
159 - while IFS="" read -d $'\0' -r f; do
160 - t="$(dirname ${f})"
161 - if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
162 - continue
163 - fi
164 - if [[ -x ${f} ]]; then
165 - exeinto /opt/cuda/sdk/"${t}"
166 - doexe "${f}"
167 - else
168 - insinto /opt/cuda/sdk/"${t}"
169 - doins "${f}"
170 - fi
171 - done < <(find . -type f -print0)
172 - eend
173 -}
174
175 diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.2.88-r1.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.2.88-r1.ebuild
176 deleted file mode 100644
177 index 60b72621e47..00000000000
178 --- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.2.88-r1.ebuild
179 +++ /dev/null
180 @@ -1,140 +0,0 @@
181 -# Copyright 1999-2021 Gentoo Authors
182 -# Distributed under the terms of the GNU General Public License v2
183 -
184 -EAPI=7
185 -
186 -inherit cuda flag-o-matic portability toolchain-funcs unpacker
187 -
188 -MYD=$(ver_cut 1-2 ${PV})
189 -DRIVER_PV="396.26"
190 -
191 -DESCRIPTION="NVIDIA CUDA Software Development Kit"
192 -HOMEPAGE="https://developer.nvidia.com/cuda-zone"
193 -SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux -> cuda_${PV}_${DRIVER_PV}_linux.run"
194 -
195 -LICENSE="CUDPP"
196 -SLOT="0"
197 -KEYWORDS="~amd64 ~amd64-linux"
198 -IUSE="+cuda debug +doc +examples opencl mpi"
199 -
200 -RDEPEND="
201 - ~dev-util/nvidia-cuda-toolkit-${PV}
202 - media-libs/freeglut
203 - examples? (
204 - media-libs/freeimage
205 - media-libs/glew:0=
206 - >=x11-drivers/nvidia-drivers-396.24[uvm(+)]
207 - mpi? ( virtual/mpi )
208 - )"
209 -DEPEND="${RDEPEND}"
210 -BDEPEND="virtual/pkgconfig"
211 -
212 -RESTRICT="test"
213 -
214 -S=${WORKDIR}/samples
215 -
216 -QA_EXECSTACK=(
217 - opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
218 - opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
219 - opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
220 - opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
221 - )
222 -
223 -src_unpack() {
224 - # We first need to unpack the cuda_${PV}_linux.run file
225 - # which includes the cuda-samples*run file.
226 - unpacker
227 - unpacker run_files/cuda-samples*run
228 -}
229 -
230 -src_prepare() {
231 - cuda_src_prepare
232 -
233 - export RAWLDFLAGS="$(raw-ldflags)"
234 -
235 - local file
236 - while IFS="" read -d $'\0' -r file; do
237 - sed \
238 - -e 's:-O[23]::g' \
239 - -e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
240 - -e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
241 - -e "/CC/s:gcc:$(tc-getCC):g" \
242 - -e "/GCC/s:g++:$(tc-getCXX):g" \
243 - -e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
244 - -e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
245 - -e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
246 - -e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
247 - -e 's:-Wimplicit::g' \
248 - -e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
249 - -e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
250 - -e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
251 - -i "${file}" || die
252 - # -e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
253 - done < <(find . -type f -name 'Makefile' -print0)
254 -
255 - rm -rf common/inc/GL || die
256 - find . -type f -name '*.a' -delete || die
257 -
258 - eapply_user
259 -}
260 -
261 -src_compile() {
262 - use examples || return
263 - local myopts=("verbose=1")
264 - use debug && myopts+=("dbg=1")
265 - export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
266 - emake \
267 - cuda-install="${EPREFIX}/opt/cuda" \
268 - CUDA_PATH="${EPREFIX}/opt/cuda/" \
269 - MPI_GCC=10 \
270 - "${myopts[@]}"
271 -}
272 -
273 -src_test() {
274 - addwrite /dev/nvidiactl
275 - addwrite /dev/nvidia0
276 -
277 - local i
278 - for i in {0..9}*/*; do
279 - emake -C "${i}" run
280 - done
281 -}
282 -
283 -src_install() {
284 - local f t crap=( *.txt Samples.htm* )
285 -
286 - if use doc; then
287 - ebegin "Installing docs ..."
288 - while IFS="" read -d $'\0' -r f; do
289 - treecopy "${f}" "${ED}"/usr/share/doc/${PF}/
290 - done < <(find -type f \( -name 'readme.txt' -o -name '*.pdf' \) -print0)
291 -
292 - while IFS="" read -d $'\0' -r f; do
293 - docompress -x "${f#${ED}}"
294 - done < <(find "${ED}"/usr/share/doc/${PF}/ -type f -name 'readme.txt' -print0)
295 - eend
296 - fi
297 -
298 - ebegin "Cleaning before installation..."
299 - for f in "${crap[@]}"; do
300 - rm -f "${f}" || die
301 - done
302 - find -type f \( -name '*.o' -o -name '*.pdf' -o -name 'readme.txt' \) -delete || die
303 - eend
304 -
305 - ebegin "Moving files..."
306 - while IFS="" read -d $'\0' -r f; do
307 - t="$(dirname ${f})"
308 - if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
309 - continue
310 - fi
311 - if [[ -x ${f} ]]; then
312 - exeinto /opt/cuda/sdk/"${t}"
313 - doexe "${f}"
314 - else
315 - insinto /opt/cuda/sdk/"${t}"
316 - doins "${f}"
317 - fi
318 - done < <(find . -type f -print0)
319 - eend
320 -}
321
322 diff --git a/profiles/package.mask b/profiles/package.mask
323 index 8cab4213d67..3d5cd1e77f6 100644
324 --- a/profiles/package.mask
325 +++ b/profiles/package.mask
326 @@ -340,7 +340,6 @@ sys-libs/db:5.1
327 # Mask gcc-7 branch (ended upstream support). Please switch
328 # to a fresher gcc branch.
329 <sys-devel/gcc-8
330 -<dev-util/nvidia-cuda-sdk-10
331
332 # Sergei Trofimovich <slyfox@g.o> (2021-05-16)
333 # Mask gcc-6 branch (ended upstream support). Please switch
334
335 diff --git a/profiles/releases/17.0/package.mask b/profiles/releases/17.0/package.mask
336 index e9154616e73..f1534f4049c 100644
337 --- a/profiles/releases/17.0/package.mask
338 +++ b/profiles/releases/17.0/package.mask
339 @@ -6,4 +6,3 @@
340 # masked in the 17.0 profiles.
341 dev-java/ecj-gcj
342 dev-java/gcj-jdk
343 -<dev-util/nvidia-cuda-sdk-9