commit: 04c76db487f3a033ac9986a457e1a4dcbf93411f Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Mon Apr 11 11:05:04 2022 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Mon Apr 11 11:06:15 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04c76db4
dev-libs/ocl-icd: drop 2.2.12-r4 Invoking maintainer time-out. Closes: https://bugs.gentoo.org/834446 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> dev-libs/ocl-icd/Manifest | 1 - dev-libs/ocl-icd/files/ocl-icd-2.2.12-gcc-10.patch | 39 ------------------ dev-libs/ocl-icd/ocl-icd-2.2.12-r4.ebuild | 46 ---------------------- 3 files changed, 86 deletions(-) diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest index ab140542f1be..a44a5260f07c 100644 --- a/dev-libs/ocl-icd/Manifest +++ b/dev-libs/ocl-icd/Manifest @@ -1,3 +1,2 @@ -DIST ocl-icd-2.2.12.tar.gz 80718 BLAKE2B 524f9eea9782323eafa2f41858c4970333c029898c651bbf15624331e184d1b439d2259532b02defd67c9ab434a35b1b9a64a28e1515b3f42f09b3a270975df7 SHA512 f1668c3a39ecfbc089ee5a5f61f44ceb86ab80e504e58064dec306ce907daf77936c5403b4af15ed8714068891d68346c86725f285cfbc90c4fcb35d18db4048 DIST ocl-icd-2.3.0.tar.gz 100848 BLAKE2B b9e5b78df63f4865bb4cb3623fbc6bd336c86b4a9e1f23a29fab1cf11f848cb20d6d8d4a480ff44e442b02d606247a923798143058256ef59c2b16c9daf7098d SHA512 003f3661b7086a7364e79d1058591f12a7095aa2c3decfc4b496f00a0863a91cd81080f33b9308e3948045f8aca5856868ed2725f478654230e51a60d654e613 DIST ocl-icd-2.3.1.tar.gz 102616 BLAKE2B f3e41d73e8cca7b42697a81f9d353341ba40ae67bb07ccbb7f6bd4fc9c8d16cbb4a9a9826ef81a381629cf1bd2c61d6ad9d7a02dcdb2871359041cfd8e9815b7 SHA512 3fa92dbcbe8ea2acf1ee967419d1b39ca7ace96e64261e3818984bd70831d62692e953c30e3e271fe74d59c634785055320f03c4d0516e2f53f7f700d3bcc76d diff --git a/dev-libs/ocl-icd/files/ocl-icd-2.2.12-gcc-10.patch b/dev-libs/ocl-icd/files/ocl-icd-2.2.12-gcc-10.patch deleted file mode 100644 index 64948d5b05e3..000000000000 --- a/dev-libs/ocl-icd/files/ocl-icd-2.2.12-gcc-10.patch +++ /dev/null @@ -1,39 +0,0 @@ -https://bugs.gentoo.org/706098 - -From 4667bddd365bcc1dc66c483835971f0083b44b1d Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <sly...@gentoo.org> -Date: Wed, 22 Jan 2020 19:38:23 +0000 -Subject: [PATCH] icd_generator.rb: fix build failure against gcc-10 - -On gcc-10 (and gcc-9 -fno-common) build fails as: - -``` -libtool: link: gcc -shared -fPIC -DPIC .libs/libdummy_icd.o .libs/libdummy_icd_gen.o \ - -ldl -g -O2 -Wl,-soname -Wl,libdummycl.so.0 -o .libs/libdummycl.so.0.0.0 -ld: .libs/libdummy_icd_gen.o:/home/slyfox/dev/git/ocl-icd/libdummy_icd_gen.h:226: - multiple definition of `master_dispatch'; .libs/libdummy_icd.o:/home/slyfox/dev/git/ocl-icd/libdummy_icd_gen.h:226: first defined here -``` - -gcc-10 will change the default from -fcommon to fno-common: -https://gcc.gnu.org/PR85678. - -The error also happens if CFLAGS=-fno-common passed explicitly. - -Reported-by: Anthony Parsons -Bug: https://bugs.gentoo.org/706098 -Signed-off-by: Sergei Trofimovich <sly...@gentoo.org> ---- - icd_generator.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/icd_generator.rb -+++ b/icd_generator.rb -@@ -207,7 +207,7 @@ def self.generate_libdummy_icd_header - } - libdummy_icd_structures += "};\n\n" - libdummy_icd_structures += "#pragma GCC visibility push(hidden)\n\n" -- libdummy_icd_structures += "struct _cl_icd_dispatch master_dispatch; \n\n" -+ libdummy_icd_structures += "extern struct _cl_icd_dispatch master_dispatch; \n\n" - $use_name_in_test.each { |k, f| - libdummy_icd_structures += "typeof(#{f}) INT#{f};\n" - } diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r4.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r4.ebuild deleted file mode 100644 index 3cc734b6f736..000000000000 --- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r4.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -USE_RUBY="ruby24 ruby25 ruby26 ruby27" -inherit autotools flag-o-matic multilib-minimal ruby-single - -DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders" -HOMEPAGE="https://github.com/OCL-dev/ocl-icd"; -SRC_URI="https://github.com/OCL-dev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 x86" - -# Does nothing now but by keeping it here we avoid having to have virtual/opencl -# handle ebuilds both with and without this flag. -IUSE="+khronos-headers" - -BDEPEND="${RUBY_DEPS}" -DEPEND="~dev-util/opencl-headers-2020.06.16" -RDEPEND="${DEPEND} - !app-eselect/eselect-opencl - !dev-libs/opencl-icd-loader" - -PATCHES=("${FILESDIR}"/${P}-gcc-10.patch) - -src_prepare() { - replace-flags -Os -O2 # bug 646122 - - default - eautoreconf -} - -multilib_src_configure() { - # dev-util/opencl-headers ARE official Khronos Group headers, what this option - # does is disable the use of the bundled ones - ECONF_SOURCE="${S}" econf --enable-pthread-once --disable-official-khronos-headers -} - -multilib_src_install() { - default - - # Drop .la files - find "${ED}" -name '*.la' -delete || die -}
