From 185fa19bbf68a4d4dca534d2b46729207a177f16 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 11 May 2021 19:55:43 +0100 Subject: gentoo resync : 11.05.2021 --- dev-util/ccache/Manifest | 5 +- dev-util/ccache/ccache-4.2.ebuild | 82 --------------------------- dev-util/ccache/ccache-4.3.ebuild | 81 ++++++++++++++++++++++++++ dev-util/ccache/files/ccache-4.2-atomic.patch | 11 ---- 4 files changed, 83 insertions(+), 96 deletions(-) delete mode 100644 dev-util/ccache/ccache-4.2.ebuild create mode 100644 dev-util/ccache/ccache-4.3.ebuild delete mode 100644 dev-util/ccache/files/ccache-4.2-atomic.patch (limited to 'dev-util/ccache') diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest index e7a2bf462ee9..8ab550de702a 100644 --- a/dev-util/ccache/Manifest +++ b/dev-util/ccache/Manifest @@ -1,10 +1,9 @@ AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435d1309fe387e62c5f9b61c783294ec81cfd1c8a0afc60e63148dcc89f95ebc6d313a0567431a8d05c96e3d59bae1 SHA512 651e26335df8eb551f95064d67925d6e7dd15c8a082b291cdea31fcbc2e5482b2358de71c205c668173b3dc5a75ef004d95dbdd92391e4a4aa6bc1283f5f3a72 AUX ccache-4.0-objdump.patch 271 BLAKE2B e641f1acef1e439660753c781d5760ab2a2530ce8dbcfacb1c3835523ec41ff35701536698827f11c39c1e06641fcf6b57d374944ecb44888a66c7860f97b813 SHA512 cc53f44b173c1ae66258aa573182ae936304dac9daf8489a20c45dbe3d554df207bd93b370da2c86b22fbc4edf5fd954f84fd18812d97d41a88ea4c7926f117c AUX ccache-4.1-avoid-run-user.patch 557 BLAKE2B 956ac163da6c8acdefb5b395549067272beea095e93686cf553d534c94d76c1c032ef3423f851907367006e1e7bc7b4afe1494bef1eb293e5aca2e3625c29c10 SHA512 bbdd370e478839980423777053baa42ce37cd18ebf8cd36d3f5b13d9252c38b17840ab6e71aefda20a9903bd4a85e4cdb4582728a9db9d1e847b0ee9569bba9e -AUX ccache-4.2-atomic.patch 236 BLAKE2B 39afe8910b218fd29261b2805cd583daaddb2e18caf136bf5f01b4fcec002a9717ebfacb028396c69ae56f7aa61aefdbb0c3e05da0545a2a3bf87aa1ab32b300 SHA512 b07868200e13b562027aa95a4d4ad949f0d9ef3e5e277a4ed67720e12cda54ddac0443b70e1c17bf8255ea70492d9d9a9931bc1fcb400ef3b134013719dbd267 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003 DIST ccache-4.2.1.tar.xz 431484 BLAKE2B 10bb0d1e263e441d91c2dfcd2b2c89f64dfb10b4c5aa66012c388fea2c99d8488538e84b5cef86abf0c9f9aaa0a562b7c7be8a9d4a4073ae3c046e7fe28b7eda SHA512 46bb760ddad5999c5bdff4f3ce6e405eb2018c4a591ad76ba3dd7921b8bfd59a257d992d285e38d69aaf86537962602689175b8741894094819775eec9493b77 -DIST ccache-4.2.tar.xz 422688 BLAKE2B 932db2e4f6ef9d98359fe44f931d083acb9fd32661d9baec5a2d0cfffc9301a999b04e4628d31513ec809bf43e3e94d71f9b92a1c83bcebbaf5e35e219596704 SHA512 b7e5823a0705b9a1100c959281170dcd682228b585c329821337ef57d5b5cf47d6f3d644a6d5a3675a32a02730559f8fe6d84d11f01847f47b77c0893d1d1fbe +DIST ccache-4.3.tar.xz 433508 BLAKE2B 6ab48aa587b4dc86020e3b0f722003dc5c03709626e143a1d38506b6072f9963fc76e89b6d18128dfc28035bf8d24e46ea44f219db69a1b3a294416f0b023090 SHA512 ec082de95ea8b22154ce1e67e0a0fc28266cfb71f382205f7eab14e6ac1c7841027d063041131832b3227d833d99ec874e90df238f35f433de4c381566931c7f EBUILD ccache-4.2.1.ebuild 1655 BLAKE2B b3cc038828f86dbd2d8060f5d13a197c399e7b99d0c0fcf4a82fbb498c212a9624fcb023f481c628a123fd1e2237689b1b094187c5fa1caa98aeca38c9c870d7 SHA512 0adb9fe19611bd373870e85d889b2bdaecb0fe6b11c40f3d48add1ecdca99c4b6beed5b151c685eaf13f0b11b0988bf870525ac23e3f78c865565f84e1aba156 -EBUILD ccache-4.2.ebuild 1693 BLAKE2B 6699454a8dc3d4a8c2b3050a1d99589592a97ca32ae9bf0ea1172b9fe7345cdafe21edd32141df31b2fd1a85c12864986637bb0c80b3dbbf3920cb8cd4a256ad SHA512 7c1d37251f59a4621c4fe107a47ffaa53d760fb2e94790fb492a06eb8d191001047b2e0c7a9b681f32847634ec7f5083a1484ab059765ba25b094712c13d0025 +EBUILD ccache-4.3.ebuild 1662 BLAKE2B 3747ef40e6edd8f35a9c2760200593bb93c222b5864f9edda872413f1f54393b01402c675a7e39280786d32f87f2a798286f6ab6c14993a366d76c6e7548eef3 SHA512 7538e49273de477d4bc77b8db6e093c5c222d59c5c25383677195399a89bce281d64014b8631ab107c5af05c04aef69f6872a55631fecaee3a81b36d957b5921 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249 diff --git a/dev-util/ccache/ccache-4.2.ebuild b/dev-util/ccache/ccache-4.2.ebuild deleted file mode 100644 index 543cf2ad6286..000000000000 --- a/dev-util/ccache/ccache-4.2.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake toolchain-funcs - -DESCRIPTION="fast compiler cache" -HOMEPAGE="https://ccache.dev/" -SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz" - -LICENSE="GPL-3 LGPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="test" - -DEPEND="" -RDEPEND="${DEPEND} - app-arch/zstd:0= - dev-util/shadowman - sys-apps/gentoo-functions -" -# clang-specific tests use dev-libs/elfutils to compare objects for equality. -# Let's pull in the dependency unconditionally. -DEPEND+=" - test? ( dev-libs/elfutils ) -" -BDEPEND=" - app-text/asciidoc -" - -RESTRICT="!test? ( test )" - -DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md ) - -PATCHES=( - "${FILESDIR}"/${PN}-3.5-nvcc-test.patch - "${FILESDIR}"/${PN}-4.0-objdump.patch - "${FILESDIR}"/${PN}-4.1-avoid-run-user.patch - "${FILESDIR}"/${PN}-4.2-atomic.patch -) - -src_prepare() { - cmake_src_prepare - - sed \ - -e "/^EPREFIX=/s:'':'${EPREFIX}':" \ - "${FILESDIR}"/ccache-config-3 > ccache-config || die - - # mainly used in tests - tc-export CC OBJDUMP -} - -src_configure() { - local mycmakeargs=( - -DUSE_CCACHE=OFF - -DUSE_FASTER_LINKER=OFF - -DZSTD_FROM_INTERNET=OFF - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - dobin ccache-config - insinto /usr/share/shadowman/tools - newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin" -} - -pkg_prerm() { - if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then - eselect compiler-shadow remove ccache - fi -} - -pkg_postinst() { - if [[ ${ROOT:-/} == / ]]; then - eselect compiler-shadow update ccache - fi -} diff --git a/dev-util/ccache/ccache-4.3.ebuild b/dev-util/ccache/ccache-4.3.ebuild new file mode 100644 index 000000000000..3f58044c6822 --- /dev/null +++ b/dev-util/ccache/ccache-4.3.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake toolchain-funcs + +DESCRIPTION="fast compiler cache" +HOMEPAGE="https://ccache.dev/" +SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz" + +LICENSE="GPL-3 LGPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="test" + +DEPEND="" +RDEPEND="${DEPEND} + app-arch/zstd:0= + dev-util/shadowman + sys-apps/gentoo-functions +" +# clang-specific tests use dev-libs/elfutils to compare objects for equality. +# Let's pull in the dependency unconditionally. +DEPEND+=" + test? ( dev-libs/elfutils ) +" +BDEPEND=" + app-text/asciidoc +" + +RESTRICT="!test? ( test )" + +DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md ) + +PATCHES=( + "${FILESDIR}"/${PN}-3.5-nvcc-test.patch + "${FILESDIR}"/${PN}-4.0-objdump.patch + "${FILESDIR}"/${PN}-4.1-avoid-run-user.patch +) + +src_prepare() { + cmake_src_prepare + + sed \ + -e "/^EPREFIX=/s:'':'${EPREFIX}':" \ + "${FILESDIR}"/ccache-config-3 > ccache-config || die + + # mainly used in tests + tc-export CC OBJDUMP +} + +src_configure() { + local mycmakeargs=( + -DUSE_CCACHE=OFF + -DUSE_FASTER_LINKER=OFF + -DZSTD_FROM_INTERNET=OFF + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + dobin ccache-config + insinto /usr/share/shadowman/tools + newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin" +} + +pkg_prerm() { + if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then + eselect compiler-shadow remove ccache + fi +} + +pkg_postinst() { + if [[ ${ROOT:-/} == / ]]; then + eselect compiler-shadow update ccache + fi +} diff --git a/dev-util/ccache/files/ccache-4.2-atomic.patch b/dev-util/ccache/files/ccache-4.2-atomic.patch deleted file mode 100644 index 6148e232af9d..000000000000 --- a/dev-util/ccache/files/ccache-4.2-atomic.patch +++ /dev/null @@ -1,11 +0,0 @@ -https://github.com/ccache/ccache/pull/800 ---- a/cmake/StdAtomic.cmake -+++ b/cmake/StdAtomic.cmake -@@ -10,6 +10,7 @@ set( - int main() - { - std::atomic x; -+ ++x; - (void)x.load(); - return 0; - } -- cgit v1.2.3