summaryrefslogtreecommitdiff
path: root/dev-util/ccache
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-04-12 03:41:30 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-04-12 03:41:30 +0100
commit623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree993eb27c93ec7a2d2d19550300d888fc1fed9e69 /dev-util/ccache
parentceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'dev-util/ccache')
-rw-r--r--dev-util/ccache/Manifest18
-rw-r--r--dev-util/ccache/ccache-3.7.2.ebuild2
-rw-r--r--dev-util/ccache/ccache-3.7.6.ebuild2
-rw-r--r--dev-util/ccache/ccache-3.7.7-r1.ebuild2
-rw-r--r--dev-util/ccache/ccache-3.7.7.ebuild2
-rw-r--r--dev-util/ccache/ccache-3.7.8-r1.ebuild (renamed from dev-util/ccache/ccache-3.7.5.ebuild)35
-rw-r--r--dev-util/ccache/ccache-3.7.8.ebuild (renamed from dev-util/ccache/ccache-3.7.4.ebuild)32
-rw-r--r--dev-util/ccache/ccache-3.7.9.ebuild70
-rw-r--r--dev-util/ccache/files/ccache-3.7.8-dev-null.patch57
9 files changed, 157 insertions, 63 deletions
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 6945288129ad..b5dcfe0bc804 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,16 +1,18 @@
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
+AUX ccache-3.7.8-dev-null.patch 1915 BLAKE2B db860ccdab29862922d08fd9af5426d04e8871b74c717efc2bcff1084e66f262be287ce8c3c6ce5c84dfd3c03457183dfe38bb77afe76be2f8edeb7e97e46822 SHA512 dece4fa910f2477fc481d974915b47928b130afcdc278b3b0fe5c71eb63f2c65e400e7d07826d42cf7086ff8e1a702b348557a7b96bbe22ce25113209e1dd2b6
AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
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
DIST ccache-3.7.7.tar.xz 351592 BLAKE2B 0b211cb77ceb42b7ee5dfcde98d9f53bf222cf18b8d38a7cf6fc9631c5e1c79ca82e6d0a0dbacfe2d5f61b2acefebe202e06fc3b8035f0f25a5f9954554a18cd SHA512 f93380aeb45e815964abc3b62f1963abafe22e0c6a7b61d039e710c7f935221e02678e21af65add4fd59fd5a141824ab95f4a7afc8dd557de36737c365cab816
-EBUILD ccache-3.7.2.ebuild 2125 BLAKE2B 1cb3f98ee681754ad0aa4314c668630a2aefd09bbcd538aa57b85ee93e151dac572e4260e978e337acf622ae0b8853fe3e1d3c08ea6a040210a648197e9920bc SHA512 34f30110f3c9660f1022bc68defc9c328a133e95bdb178691ecc974af5a78f9028af6e8b41dad67f94339ef04483fc86757af1a729861a02d5e5ba1a8f58b068
-EBUILD ccache-3.7.4.ebuild 2197 BLAKE2B 0a57b7416d2e5f60eebcff3f1f76a24e288a67be07ecebbc32e2bceb97a79576ef6cac6b5fefa7d2cf305ceb4db1db20df6f530d41e844f9baf757c898419252 SHA512 8e1c51681be2334da6c5ea19fddebe86965af14b16c84c790ad483fc0b62e66bf85a53ae09437d2cf3a0e334cfa91e179848b6d618b152a5d35740bd876f070c
-EBUILD ccache-3.7.5.ebuild 2207 BLAKE2B 00f468b17f0531f0ae2d3130027c0b8a9851ab2650076e708c9125f2a83af90301748a37005373b080d09931fa0de6ebd1eb8f1a95231fbf11c6f1d50286640e SHA512 e40eedd3ccf2f031902360d43b0d86a51140195acb5c19dad1e70f52aeab75759270d43263b0d60631be9b5475c72015d025a8e5dfe94d3c81f47faf90dddda3
-EBUILD ccache-3.7.6.ebuild 2198 BLAKE2B 39e6080eceb45e90120d59e45934eecbfc1bc34bddfd3c5ee5a3e6b63bfd7c69b259513fbdbc6cfae27e75137d489d3f531502933c69e14a2033456f247bf52a SHA512 0ee3637f7ec2e352113a3204a1e0bf7e6c9bfce9cf1c8965209dd9321c2293b08b73d55a3b0b9ff9047a6bec025697e6ab21aa865714b654853f5c3e80196a77
-EBUILD ccache-3.7.7-r1.ebuild 2217 BLAKE2B c4380e454dbda07ecf5a1de31b4bec0c69dc17961328ff0eb7332ac45c32a5eebfd37f1c810f9aa06a3f8e79415ec2d1f866fdd911cd2c303dcb7bc54532f24e SHA512 c9221159b609d4f7799438b345c66b12733cc848f8274802498d6d711acad970ebacc5f0f187e7ed7d9a393d266d53bda734b1a0325b35fbfbd7512672dc79f4
-EBUILD ccache-3.7.7.ebuild 2198 BLAKE2B 39e6080eceb45e90120d59e45934eecbfc1bc34bddfd3c5ee5a3e6b63bfd7c69b259513fbdbc6cfae27e75137d489d3f531502933c69e14a2033456f247bf52a SHA512 0ee3637f7ec2e352113a3204a1e0bf7e6c9bfce9cf1c8965209dd9321c2293b08b73d55a3b0b9ff9047a6bec025697e6ab21aa865714b654853f5c3e80196a77
+DIST ccache-3.7.8.tar.xz 352528 BLAKE2B 8d8896b100c43a3e9a60445c95369cd8898fdbf653fc4d5791b8e1abc0191882319078d619429213a5f6968a1dbc639808037459c80514cea775d261c83b949a SHA512 dc8cc9cd5f6f054421f0ecb50f66e0af85222c347d59fecd4555dfe1d8d6cbdca304818de8bc8a39fc1a1225567c141ce104ac315369bf6c307e9da67e14b51c
+DIST ccache-3.7.9.tar.xz 352948 BLAKE2B 791491c3f9da58f06bb0a58e411d9a7b3e39e460102793ef736820913d43d488ce7daffba572c21f507ea78d8da04edc3aaa47eb1a0fbec8cb35461a60b770e9 SHA512 5d39baeb66265451b0e9cef250f6d9c5f6869cd87e27c108c9a50bef80050122ed4280ff662a81bba8d1d1311f2004bcaf9ada6b783a42eedc67ca01ebc48bb4
+EBUILD ccache-3.7.2.ebuild 2123 BLAKE2B 9e8a30d3a311ffb521290f359f86f373722a3ed713e785dbe83b129f8807f4ff94533841f9da24e8f9d998407dc3b476d758b65f26c226a77f5e1ef29e421d43 SHA512 38aa9e79d78cc3443df189f86d6887af8bf7d753fd51e22de76fd734a8329e5111da12871344a5b5a5966be8c50927732620b2253c701a88795f0c6dfd72bc82
+EBUILD ccache-3.7.6.ebuild 2194 BLAKE2B bcb4d276405b962fefedbff9509071c00b5e5a3712514b3dca773f7710fd8ce9f3d8da24231068ff46579e58a77989d21e75c9f94e5b3ab37d1f54ba76268362 SHA512 0a8bf30ea68543c490a2c7b9e343e6c1ec4dd4487cf92ccb2eaf461102d9bd80b67164f74b99ce54fb1158738c4d34884151809d5a23b69ba47d09ceab503219
+EBUILD ccache-3.7.7-r1.ebuild 2204 BLAKE2B 168006b6402a929a5c4367d98fafcfac1f6bb0a4ae11c2aa495cc6c326a7ff21cedc81204451ffa592b1b6f04150aa7923f0eff851ad502496bc101641f7ae0c SHA512 f60bdfe797f15da5ce90a784029dce92971bd15b90e91d1503ff2da78d8ef6d57a9b98ffa75c1f9565f4e5a71bc09e0be58946a0613d3fe2fdbb20d1797c8ccf
+EBUILD ccache-3.7.7.ebuild 2195 BLAKE2B 75e92e265e3daf5d40d1d32b226ae9009bdc0848611c7594441280ddc76cec3986aaa1fb48692a6d2dcf796fda4deaccad28d9a76847072a2eb8a0f71ca54df0 SHA512 530953304727f3385e2c9998181709d273ee56e3d471ad569b8b4a8ababdb6eff1c3b47e1130ae7087e72fa4f9c1783e3851bba72a4308be7ab627a2a1f7dbef
+EBUILD ccache-3.7.8-r1.ebuild 1470 BLAKE2B 06a6684242b4dd5ac5bdd1a3fbb2c88e4d3b711757acc3ebf6d10889001404655658ed33fd0e4f5a52ec373a63cd4d21caf2e5a84e00809d7d7bed7a000604d1 SHA512 a377a4a03ff589ea08574431194ee49509beb7838d73bd6aa1f2051086126561b9f391baef2f00b4e6e1769f3803d4bec9a3bef4746a4a1763bd03eb82042120
+EBUILD ccache-3.7.8.ebuild 1428 BLAKE2B c13461bee81b00852bc29677a8db4b15aab94601694fcd2dfa28c670053bb2d3ba0a979bbe6448b9c382b6693fa9a976604a6b54994f73d5fb753b0c8e19519b SHA512 6534dfb466f2fde49af395bf1d70fbeb17b4be1fea1b235794c61cb51da6d310336aff3a7a1f02a5b099124eb0ccffd097762d9cd8e7f676739ceff24fe0fd11
+EBUILD ccache-3.7.9.ebuild 1428 BLAKE2B c13461bee81b00852bc29677a8db4b15aab94601694fcd2dfa28c670053bb2d3ba0a979bbe6448b9c382b6693fa9a976604a6b54994f73d5fb753b0c8e19519b SHA512 6534dfb466f2fde49af395bf1d70fbeb17b4be1fea1b235794c61cb51da6d310336aff3a7a1f02a5b099124eb0ccffd097762d9cd8e7f676739ceff24fe0fd11
MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.7.2.ebuild b/dev-util/ccache/ccache-3.7.2.ebuild
index 898d97b2848b..bcce80b853ca 100644
--- a/dev-util/ccache/ccache-3.7.2.ebuild
+++ b/dev-util/ccache/ccache-3.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE=""
DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccache/ccache-3.7.6.ebuild b/dev-util/ccache/ccache-3.7.6.ebuild
index d516baace6e4..271109bf94aa 100644
--- a/dev-util/ccache/ccache-3.7.6.ebuild
+++ b/dev-util/ccache/ccache-3.7.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="test"
DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccache/ccache-3.7.7-r1.ebuild b/dev-util/ccache/ccache-3.7.7-r1.ebuild
index c076f0d16ec9..915fe80c14aa 100644
--- a/dev-util/ccache/ccache-3.7.7-r1.ebuild
+++ b/dev-util/ccache/ccache-3.7.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="test"
DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccache/ccache-3.7.7.ebuild b/dev-util/ccache/ccache-3.7.7.ebuild
index d516baace6e4..84e1e14d82b0 100644
--- a/dev-util/ccache/ccache-3.7.7.ebuild
+++ b/dev-util/ccache/ccache-3.7.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="test"
DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccache/ccache-3.7.5.ebuild b/dev-util/ccache/ccache-3.7.8-r1.ebuild
index 998d395a3b2d..620e3f3c820e 100644
--- a/dev-util/ccache/ccache-3.7.5.ebuild
+++ b/dev-util/ccache/ccache-3.7.8-r1.ebuild
@@ -1,17 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="test"
DEPEND="app-arch/xz-utils
@@ -19,7 +17,7 @@ DEPEND="app-arch/xz-utils
RDEPEND="${DEPEND}
dev-util/shadowman
sys-apps/gentoo-functions"
-# clang-specific tests use it to compare objects for equality.
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
# Let's pull in the dependency unconditionally.
DEPEND+="
test? ( dev-libs/elfutils )"
@@ -28,18 +26,21 @@ RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+ "${FILESDIR}"/${PN}-3.7.8-dev-null.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_configure() {
+ econf --without-bundled-zlib
+}
+
src_compile() {
emake V=1
}
@@ -54,20 +55,7 @@ src_install() {
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
+ newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
}
pkg_prerm() {
@@ -80,9 +68,4 @@ 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/ccache-3.7.4.ebuild b/dev-util/ccache/ccache-3.7.8.ebuild
index 033b34c72fe9..32f24f67e079 100644
--- a/dev-util/ccache/ccache-3.7.4.ebuild
+++ b/dev-util/ccache/ccache-3.7.8.ebuild
@@ -3,15 +3,13 @@
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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="test"
DEPEND="app-arch/xz-utils
@@ -19,7 +17,7 @@ DEPEND="app-arch/xz-utils
RDEPEND="${DEPEND}
dev-util/shadowman
sys-apps/gentoo-functions"
-# clang-specific tests use it to compare objects for equality.
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
# Let's pull in the dependency unconditionally.
DEPEND+="
test? ( dev-libs/elfutils )"
@@ -33,13 +31,15 @@ PATCHES=(
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_configure() {
+ econf --without-bundled-zlib
+}
+
src_compile() {
emake V=1
}
@@ -54,20 +54,7 @@ src_install() {
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
+ newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
}
pkg_prerm() {
@@ -80,9 +67,4 @@ 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/ccache-3.7.9.ebuild b/dev-util/ccache/ccache-3.7.9.ebuild
new file mode 100644
index 000000000000..32f24f67e079
--- /dev/null
+++ b/dev-util/ccache/ccache-3.7.9.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~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 dev-libs/elfutils 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
+
+ sed \
+ -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+ "${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_configure() {
+ econf --without-bundled-zlib
+}
+
+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 <<<"${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-3.7.8-dev-null.patch b/dev-util/ccache/files/ccache-3.7.8-dev-null.patch
new file mode 100644
index 000000000000..389f9e3a1e2b
--- /dev/null
+++ b/dev-util/ccache/files/ccache-3.7.8-dev-null.patch
@@ -0,0 +1,57 @@
+https://bugs.gentoo.org/712080
+
+From 9a794689a8ba47e79c96d6c370976448b756973c Mon Sep 17 00:00:00 2001
+From: Joel Rosdahl <joel@rosdahl.net>
+Date: Sun, 22 Mar 2020 14:30:23 +0100
+Subject: [PATCH] Disable hard link mode when the output object file is
+ /dev/null
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When hard link mode is enabled, ccache ≥3.6 unlinks the output file
+before writing to it as a workaround for a bug in Clang (#331). This
+unfortunately means that /dev/null will be removed when building as root
+(don’t do that, BTW) with hard link mode enabled and /dev/null as the
+the output file. A similar problem exists if the dependency file is
+/dev/null, regardless of hard link mode.
+
+Fix this by not unlinking the output file if it’s /dev/null and by not
+copying files to /dev/null at all. (There is no need to handle other
+non-regular output files since /dev/null is the only allowed non-regular
+output file.)
+
+Fixes #564.
+---
+ src/ccache.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/ccache.c b/src/ccache.c
+index 6e9da51..b9bafac 100644
+--- a/src/ccache.c
++++ b/src/ccache.c
+@@ -1299,6 +1299,11 @@ move_file_to_cache_same_fs(const char *source, const char *dest)
+ static void
+ do_copy_or_link_file_from_cache(const char *source, const char *dest, bool copy)
+ {
++ if (str_eq(dest, "/dev/null")) {
++ cc_log("Skipping copy from %s to %s", source, dest);
++ return;
++ }
++
+ int ret;
+ bool do_link = !copy && conf->hard_link && !file_is_compressed(source);
+ if (do_link) {
+@@ -1432,7 +1437,8 @@ to_cache(struct args *args, struct hash *depend_mode_hash)
+ args_add(args, "-o");
+ args_add(args, output_obj);
+
+- if (conf->hard_link) {
++ if (conf->hard_link && !str_eq(output_obj, "/dev/null")) {
++ // This is a workaround for https://bugs.llvm.org/show_bug.cgi?id=39782.
+ x_unlink(output_obj);
+ }
+
+--
+2.26.0
+