From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- dev-util/ccache/Manifest | 3 +- dev-util/ccache/ccache-3.7.6.ebuild | 88 ++++++++++++++++++++++ .../ccache/files/ccache-3.3-size-on-disk.patch | 22 ------ 3 files changed, 90 insertions(+), 23 deletions(-) create mode 100644 dev-util/ccache/ccache-3.7.6.ebuild delete mode 100644 dev-util/ccache/files/ccache-3.3-size-on-disk.patch (limited to 'dev-util/ccache') diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest index 29f18da8b773..8c2bd22ca4d0 100644 --- a/dev-util/ccache/Manifest +++ b/dev-util/ccache/Manifest @@ -1,4 +1,3 @@ -AUX ccache-3.3-size-on-disk.patch 559 BLAKE2B ef3c24c4094153e2ed2b071f42d83c86352bad696bfca2b59357973be83afbb5dd9fe7f0df25604808db59b97a193815b8b31f5f07819c1da0f7776aea36e6aa SHA512 09341435cbcafe38ba641ea4507091bf5e7b4ad38922d5ca0f7750637d65fbef64504312eb5e0ca1551371da64d76acf2d5461a59cb04d23d812e4050772253f AUX ccache-3.4-size-on-disk.patch 567 BLAKE2B 8ac22301eabf54922f69d135ad99a8ad9ac83df956af274bd088909ae973af18c476b408f126ad59e60c69fc1ed02f90b0021074a24ca47f804f539063303dd3 SHA512 9e8eba9926fd8e8b90572365729388bf1bfdadae9cab8b739a614de10759bf69d709075fd92c77d1945e45cc4f6c3865c694a2129d7c30f0b14f2324b4df2133 AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435d1309fe387e62c5f9b61c783294ec81cfd1c8a0afc60e63148dcc89f95ebc6d313a0567431a8d05c96e3d59bae1 SHA512 651e26335df8eb551f95064d67925d6e7dd15c8a082b291cdea31fcbc2e5482b2358de71c205c668173b3dc5a75ef004d95dbdd92391e4a4aa6bc1283f5f3a72 AUX ccache-3.6-disable-sized-cleanup.patch 834 BLAKE2B a8f6ef6fc900c7cff9ae68a25f997c8e5b2cf1e98392047837efd07c91ede129dbbca2d6aa1a2532d149675f658220aa251b0fe066597f862aa2c44ec30fbda3 SHA512 3d0ab124e119b1757fd272a3585aee14e83c092459411d300fef198ca16483ec9149baedb54a9a8333b5a24a34506da550afcdf4e10ae2657c01164244e1519d @@ -6,7 +5,9 @@ AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b3 DIST ccache-3.7.2.tar.xz 351168 BLAKE2B 6e5c8847f961bd5aa2cf325e582ece9e8bfb9c015fe3dcb01c8ca1e1834fdfb82a351ec49e203721486817df58c6aebf28e0af011f470fb739d5016f72191654 SHA512 3290f0609c27a2f063e632392be01ef163273115700f87a6d2954fcfd52fcc14bf66fc147ecbd2b692258317e113bf8be9f7efdf377560e2e8d9dd67cef58147 DIST ccache-3.7.4.tar.xz 351576 BLAKE2B fa2a9c051ff3f9c0550c6301e8d6c9e0eb7ac68687a30a6e8c1ee794ecd6b62925fdc940d493a9fb22d9094c5f2a0f3b2788c6291430ca532661ea6ddef45456 SHA512 cc382f37f7efb30a64f6fc2b136ef7424fe51795a778dbb18dde7c9e80636515f242f51c3ef3231f74d154e65ed9e815abf8241eb1a8f4e0b4fe4f533ea27146 DIST ccache-3.7.5.tar.xz 352440 BLAKE2B 6761d7a1a8c8086081fa46d50db1dce719856910da6324c9863a3f3731fdb0f5153e0d93a5c575074d1993650623e4e4b02d83dd3b656a31cb9be04ad6b58efa SHA512 d66eb9d923c3e4663242a034860bd198175e08274a295b6d5d94e6cd69fe32afa3fb8c228d64d5c5dda025e6f97d0aef0586ce4dbd66e8ce3a23093331f1841f +DIST ccache-3.7.6.tar.xz 352692 BLAKE2B 97f6c3ea119b7f1f4fdab1dc88ac34a23bd8f893a1e399dd9f934b345ea27999b3750be6b474caf2bcaea77eb9281f99623312aa55dc5b5ffb7cf5e670b173f4 SHA512 c92a699b9761bbbde1666a9bc2718070a5beb24f7054d91226790c7903fe2e26a02d0782822bc811aaffcd88df3cd3e011a19061eb69569ed7140765cef8d6ba EBUILD ccache-3.7.2.ebuild 2124 BLAKE2B c61c9962801505c448c7e3a547f229414962f166d5d15637f454ab78b7947484f0b55ea08bab7514eeca2b7e1b7c3b8e946a106ad5a25c3d6fef613cab3443e6 SHA512 cea7f8af0eaf881926aafb8a7c12c359eb51a226b4e29ec20c37f233d09dd0bceb0ef27b7dd0354289c2b6b0e3b5ce70e46530a6abbe4c4f1882a4a0879386cd EBUILD ccache-3.7.4.ebuild 2196 BLAKE2B be9b00c6fd13b5619dc65103a0da6bb4086b9132b2d76345a3887a2b90c21e48dd77c6f92688d6c272749d19572eb2499e68e542b2ed6d1cae87d3d4bc0ee678 SHA512 9dc9b015dd8b5e91e5ba7a1b9888c39f3f408c35b34615ddc5111a09d781d7d91fe8c017a8cbdd589b4dce95711f4d9a06c93c50444b7070103a82e751d1066e EBUILD ccache-3.7.5.ebuild 2207 BLAKE2B 00f468b17f0531f0ae2d3130027c0b8a9851ab2650076e708c9125f2a83af90301748a37005373b080d09931fa0de6ebd1eb8f1a95231fbf11c6f1d50286640e SHA512 e40eedd3ccf2f031902360d43b0d86a51140195acb5c19dad1e70f52aeab75759270d43263b0d60631be9b5475c72015d025a8e5dfe94d3c81f47faf90dddda3 +EBUILD ccache-3.7.6.ebuild 2207 BLAKE2B 00f468b17f0531f0ae2d3130027c0b8a9851ab2650076e708c9125f2a83af90301748a37005373b080d09931fa0de6ebd1eb8f1a95231fbf11c6f1d50286640e SHA512 e40eedd3ccf2f031902360d43b0d86a51140195acb5c19dad1e70f52aeab75759270d43263b0d60631be9b5475c72015d025a8e5dfe94d3c81f47faf90dddda3 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249 diff --git a/dev-util/ccache/ccache-3.7.6.ebuild b/dev-util/ccache/ccache-3.7.6.ebuild new file mode 100644 index 000000000000..998d395a3b2d --- /dev/null +++ b/dev-util/ccache/ccache-3.7.6.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit readme.gentoo-r1 + +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" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" +IUSE="test" + +DEPEND="app-arch/xz-utils + sys-libs/zlib" +RDEPEND="${DEPEND} + dev-util/shadowman + sys-apps/gentoo-functions" +# clang-specific tests use it to compare objects for equality. +# Let's pull in the dependency unconditionally. +DEPEND+=" + test? ( dev-libs/elfutils )" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-3.5-nvcc-test.patch +) + +src_prepare() { + default + + # make sure we always use system zlib + rm -rf src/zlib || die + sed \ + -e "/^EPREFIX=/s:'':'${EPREFIX}':" \ + "${FILESDIR}"/ccache-config-3 > ccache-config || die +} + +src_compile() { + emake V=1 +} + +src_test() { + emake check V=1 +} + +src_install() { + DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md ) + default + + dobin ccache-config + insinto /usr/share/shadowman/tools + newins - ccache <<<'/usr/lib/ccache/bin' + + DOC_CONTENTS=" +To use ccache with **non-Portage** C compiling, add +'${EPREFIX}/usr/lib/ccache/bin' to the beginning of your path, before +'${EPREFIX}/usr/bin'. Portage will automatically take advantage of ccache with +no additional steps. If this is your first install of ccache, type +something like this to set a maximum cache size of 2GB:\\n +# ccache -M 2G\\n +If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n +# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n +ccache now supports sys-devel/clang and dev-lang/icc, too!" + + readme.gentoo_create_doc +} + +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 + + # nuke broken symlinks from previous versions that shouldn't exist + rm -rf "${EROOT}"/usr/lib/ccache.backup || die + + readme.gentoo_print_elog +} diff --git a/dev-util/ccache/files/ccache-3.3-size-on-disk.patch b/dev-util/ccache/files/ccache-3.3-size-on-disk.patch deleted file mode 100644 index 277e9a6469a0..000000000000 --- a/dev-util/ccache/files/ccache-3.3-size-on-disk.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://bugs.gentoo.org/456178 -https://github.com/ccache/ccache/issues/442 - -stick to the size of files on disk rather than their byte size. -this func is only used for stats management, so this should be safe. - ---- a/util.c -+++ b/util.c -@@ -845,12 +845,7 @@ file_size(struct stat *st) - #ifdef _WIN32 - return (st->st_size + 1023) & ~1023; - #else -- size_t size = st->st_blocks * 512; -- if ((size_t)st->st_size > size) { -- // Probably a broken stat() call... -- size = (st->st_size + 1023) & ~1023; -- } -- return size; -+ return st->st_blocks * 512; - #endif - } - -- cgit v1.2.3