* [gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/
@ 2016-05-27 20:40 Mike Frysinger
0 siblings, 0 replies; 19+ messages in thread
From: Mike Frysinger @ 2016-05-27 20:40 UTC (permalink / raw
To: gentoo-commits
commit: 0c06be89f43a6e357bcf55e3bc8e97ffad5f7633
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri May 27 20:40:15 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Fri May 27 20:40:19 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c06be89
dev-util/ccache: drop old <3.2.4 versions
dev-util/ccache/Manifest | 6 -
dev-util/ccache/ccache-2.4-r9.ebuild | 83 ---------
dev-util/ccache/ccache-3.1.10-r1.ebuild | 69 --------
dev-util/ccache/ccache-3.1.9-r4.ebuild | 71 --------
dev-util/ccache/ccache-3.2.1-r1.ebuild | 69 --------
dev-util/ccache/ccache-3.2.2.ebuild | 69 --------
dev-util/ccache/ccache-3.2.3.ebuild | 68 --------
dev-util/ccache/files/ccache-2.4-profile.patch | 27 ---
.../ccache/files/ccache-2.4-respectflags.patch | 13 --
dev-util/ccache/files/ccache-2.4-utimes.patch | 105 ------------
dev-util/ccache/files/ccache-2.4-xrealloc.patch | 35 ----
.../files/ccache-3.1.10-real-temp-files.patch | 185 ---------------------
dev-util/ccache/files/ccache-3.1.7-no-perl.patch | 15 --
.../ccache/files/ccache-3.1.9-test-gcc-4.8.patch | 156 -----------------
dev-util/ccache/files/ccache-config | 100 -----------
dev-util/ccache/files/ccache-config-2 | 97 -----------
16 files changed, 1168 deletions(-)
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index e8cf550..8545398 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,8 +1,2 @@
-DIST ccache-2.4.tar.gz 86363 SHA256 435f862ca5168c346f5aa9e242174bbf19a5abcaeecfceeac2f194558827aaa0 SHA512 6ab05f74eba5c0a7472a3d53cfa6c24e45f421f2c773776f713a46121eda21213deb34fcef214d4f8d2e756cd375637e4639a9bdfeb6b9a44455c5bcca246b19 WHIRLPOOL eb308222713d17f52f88ac97a5c63add454b350d60259d1d2238e3b54f1e80ad8c8700e0e045b40aa5be64b1db54846a86da600436778a64d2270efff7763380
-DIST ccache-3.1.10.tar.xz 240932 SHA256 88439f43d3b426ab435afdf69a808511bada4de3a8a9527426bc4fbf6cb02857 SHA512 6a1c77161ec97b556a8c58592e2d6bba8e3d43cc039de3ebaa2a80fb92ae54bb7bad58eb011f52b750e29aadb0ed208220fb67d30deaf6c64aa4cfab31937fed WHIRLPOOL 5d527d986ba14a6312f82df277d7de47757bb43b7bcaf9eb6cbdbf337af862726f1f85ff7c352d0ad54344d98a8d8dc538e43de05976cdd29710b72917b42106
-DIST ccache-3.1.9.tar.xz 238988 SHA256 4981fdf3ad851de400d94083a0d03f115ce9ce8062c3fd7a291630294b0006c4 SHA512 b73f5816bb87c2d94200473510ea42a304c5a2c5e5f14720c513574ce3eb983423c5849a786a89df70cbb09852d9ec2761ad37a820a767d7350e1a3243148ac0 WHIRLPOOL 61ef671aae68516ecfaee88a50b8f442968a7ab24595fd7dfc652ab27de80834d90510c62cfcc75dd88e1f3832989633f518ebe5984149c16d5ab9848cff05fc
-DIST ccache-3.2.1.tar.xz 297868 SHA256 872af34e1d2cef18694001d29db7f167d644e7602ca32cd6c74b28d81458bd9d SHA512 ef0e56f2d1775fb0f401f48cca2a65eb415f4e2ccf0bcfd769045a9c08c3c2977db4edea12e06629f4cb5406cde23cd3ee0910e2e4d5eff9376227fa23c78a7a WHIRLPOOL f3d07cf142258d588a1c6cb9ba77d31d7b568cd18ae131ed3526595c809352b0fa30ae61b0bfcbfde3ea8d959c545119662c25af0cd03c97517be361315e1ffe
-DIST ccache-3.2.2.tar.xz 300808 SHA256 4f0d99699f24d198494addca0f41a93b0150cdfd01491f15a5d7eb02c7c2a0ca SHA512 fc438f3b00baa41076eee3e5783ea53a208eb348343e587c6f729f7e98462cd20c720fe323fe08f271bc14dae48f7828cef769882f028f3772992989b87b075d WHIRLPOOL 095a125e869910644622b98b7720a01ccc235fbeb8c84ec52017fe52f82fe7b8122584c3e5fa4d39c1344e9c062517a1edb46c3e64fe649e845ed5c1fb455c5a
-DIST ccache-3.2.3.tar.xz 301728 SHA256 ec0414fc435982ece8b8fca062f5836ff32c5d5148abd7f80768614ed776600e SHA512 27da2032fd8936253e29f0410fc2f8085967de78ebe300bd1efecf78c67ed5e060e543df96bb29bc1bea75ec4d5e108f89d58dc6d9573bf6fcc8384d00b951dd WHIRLPOOL 721e9e8dab552c40bfd77df3225e33d49553b2bee5ec990dc6f33ce8bdd9009f4f35b75d08d04ce51ee36e0772a5b403c4d8629627dd6d488b717e23b3d3657c
DIST ccache-3.2.4.tar.xz 302548 SHA256 1c3da93f654e78a4ac71a54b0f63b19bc0fef9aa5522f4ebb9c201d4361cea5d SHA512 d048b70804c81dece97f3ba511b3c109ec0d14e7dca69bc68faeeb61a4a7b5639c03e3e5ad7dad4e42b4bd198d7a7fffa4e3b7ef99590dfd4df0805db6c25db7 WHIRLPOOL 3dc1de9d1cab8769b3776e48746a1967536e7a9d01e4eb23e1ddbaaf2858c16eba170a185312bfdb0a58951c77cd6c79ff30c7cf6ab366ade64c2b6997df7703
DIST ccache-3.2.5.tar.xz 304592 SHA256 117011534b199dbe290b08acae1591c81525536a1e140da22e0fbc04c20bab85 SHA512 12612b899044db50c60bea8ed6cfeb54960ab67514d0aabaea5ee71d3d4d83bb00637e02008365d1d061adf5aa546499948a5eb8a0419222f681058c7fd5fd24 WHIRLPOOL 2cad966b419c16d7956fb2644c1113a8817437f313d54dd17fb16ae4a15f67a322b59d1b225307c980d2e17442478b71ef2bb118d2af4025e530e68fb46767cb
diff --git a/dev-util/ccache/ccache-2.4-r9.ebuild b/dev-util/ccache/ccache-2.4-r9.ebuild
deleted file mode 100644
index 6aeeaf5..0000000
--- a/dev-util/ccache/ccache-2.4-r9.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-WANT_AUTOMAKE=none # not using automake
-
-inherit eutils autotools multilib
-
-DESCRIPTION="fast compiler cache"
-HOMEPAGE="http://ccache.samba.org/"
-SRC_URI="http://samba.org/ftp/ccache/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-# Note: this version is designed to be auto-detected and used if
-# you happen to have Portage 2.0.X+ installed.
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/ccache-2.4-profile.patch
- epatch "${FILESDIR}"/ccache-2.4-respectflags.patch
- epatch "${FILESDIR}"/ccache-2.4-utimes.patch
- epatch "${FILESDIR}"/ccache-2.4-xrealloc.patch #338137
- eautoconf
-}
-
-do_links() {
- insinto /usr/$(get_libdir)/ccache/bin
- for a in ${CHOST}-{gcc,g++,c++} gcc c++ g++; do
- dosym /usr/bin/ccache /usr/$(get_libdir)/ccache/bin/${a}
- done
-}
-
-src_install() {
- dobin ccache || die
- doman ccache.1
- dodoc README
- dohtml web/*.html
-
- diropts -m0755
- dodir /usr/$(get_libdir)/ccache/bin
- keepdir /usr/$(get_libdir)/ccache/bin
-
- dobin "${FILESDIR}"/ccache-config || die
-
- diropts -m0700
- dodir /root/.ccache
- keepdir /root/.ccache
-}
-
-pkg_preinst() {
- # Do NOT duplicate this in your ebuilds or phear of the wrath!!!
- if [[ ${ROOT} = "/" ]] ; then
- einfo "Scanning for compiler front-ends..."
- do_links
- else
- ewarn "Install is incomplete; you must run the following commands:"
- ewarn " # ccache-config --install-links"
- ewarn " # ccache-config --install-links ${CHOST}"
- ewarn "after booting or chrooting to ${ROOT} to complete installation."
- fi
-}
-
-pkg_postinst() {
- # nuke broken symlinks from previous versions that shouldn't exist
- for i in cc ${CHOST}-cc ; do
- [[ -L "${ROOT}/usr/$(get_libdir)/ccache/bin/${i}" ]] && \
- rm -rf "${ROOT}/usr/$(get_libdir)/ccache/bin/${i}"
- done
- [[ -d "${ROOT}/usr/$(get_libdir)/ccache.backup" ]] && \
- rm -fr "${ROOT}/usr/$(get_libdir)/ccache.backup"
-
- elog "To use ccache with **non-Portage** C compiling, add"
- elog "/usr/$(get_libdir)/ccache/bin to the beginning of your path, before /usr/bin."
- elog "Portage 2.0.46-r11+ will automatically take advantage of ccache with"
- elog "no additional steps. If this is your first install of ccache, type"
- elog "something like this to set a maximum cache size of 2GB:"
- elog "# ccache -M 2G"
-}
diff --git a/dev-util/ccache/ccache-3.1.10-r1.ebuild b/dev-util/ccache/ccache-3.1.10-r1.ebuild
deleted file mode 100644
index 8deb6f7..0000000
--- a/dev-util/ccache/ccache-3.1.10-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils readme.gentoo
-
-DESCRIPTION="fast compiler cache"
-HOMEPAGE="http://ccache.samba.org/"
-SRC_URI="http://samba.org/ftp/ccache/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
- app-arch/xz-utils"
-
-src_prepare() {
- # make sure we always use system zlib
- rm -rf zlib
- epatch "${FILESDIR}"/${PN}-3.1.7-no-perl.patch #421609
- epatch "${FILESDIR}"/${PN}-3.1.10-size-on-disk.patch #456178
- epatch "${FILESDIR}"/${PN}-3.1.10-real-temp-files.patch
- sed \
- -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
- "${FILESDIR}"/ccache-config-2 > ccache-config || die
-}
-
-src_install() {
- default
- dodoc AUTHORS.txt MANUAL.txt NEWS.txt README.txt
-
- dobin ccache-config
-
- 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 2.0.46-r11+ 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} ]] ; then
- "${EROOT}"/usr/bin/ccache-config --remove-links
- "${EROOT}"/usr/bin/ccache-config --remove-links ${CHOST}
- fi
-}
-
-pkg_postinst() {
- "${EROOT}"/usr/bin/ccache-config --install-links
- "${EROOT}"/usr/bin/ccache-config --install-links ${CHOST}
-
- # nuke broken symlinks from previous versions that shouldn't exist
- rm -f "${EROOT}"/usr/lib/ccache/bin/${CHOST}-cc
- rm -rf "${EROOT}"/usr/lib/ccache.backup
-
- readme.gentoo_print_elog
-}
diff --git a/dev-util/ccache/ccache-3.1.9-r4.ebuild b/dev-util/ccache/ccache-3.1.9-r4.ebuild
deleted file mode 100644
index 4b7b2d5..0000000
--- a/dev-util/ccache/ccache-3.1.9-r4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit multilib eutils readme.gentoo
-
-DESCRIPTION="fast compiler cache"
-HOMEPAGE="http://ccache.samba.org/"
-SRC_URI="http://samba.org/ftp/ccache/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="app-arch/xz-utils
- sys-libs/zlib"
-RDEPEND="${DEPEND}
- sys-apps/gentoo-functions"
-
-src_prepare() {
- # make sure we always use system zlib
- rm -rf zlib
- epatch "${FILESDIR}"/${PN}-3.1.7-no-perl.patch #421609
- epatch "${FILESDIR}"/${P}-test-gcc-4.8.patch #461966
- sed \
- -e "/^LIBDIR=/s:lib:$(get_libdir):" \
- -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
- "${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_install() {
- default
- dodoc AUTHORS.txt MANUAL.txt NEWS.txt README.txt
-
- dobin ccache-config
-
- DOC_CONTENTS="
-To use ccache with **non-Portage** C compiling, add
-${EPREFIX}/usr/$(get_libdir)/ccache/bin to the beginning of your path, before ${EPREFIX}usr/bin.
-Portage 2.0.46-r11+ 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} ]] ; then
- "${EROOT}"/usr/bin/ccache-config --remove-links
- "${EROOT}"/usr/bin/ccache-config --remove-links ${CHOST}
- fi
-}
-
-pkg_postinst() {
- "${EROOT}"/usr/bin/ccache-config --install-links
- "${EROOT}"/usr/bin/ccache-config --install-links ${CHOST}
-
- # nuke broken symlinks from previous versions that shouldn't exist
- rm -f "${EROOT}/usr/$(get_libdir)/ccache/bin/${CHOST}-cc"
- [[ -d "${EROOT}/usr/$(get_libdir)/ccache.backup" ]] && \
- rm -rf "${EROOT}/usr/$(get_libdir)/ccache.backup"
-
- readme.gentoo_print_elog
-}
diff --git a/dev-util/ccache/ccache-3.2.1-r1.ebuild b/dev-util/ccache/ccache-3.2.1-r1.ebuild
deleted file mode 100644
index dfd1b11..0000000
--- a/dev-util/ccache/ccache-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils readme.gentoo
-
-DESCRIPTION="fast compiler cache"
-HOMEPAGE="http://ccache.samba.org/"
-SRC_URI="http://samba.org/ftp/ccache/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="app-arch/xz-utils
- sys-libs/zlib"
-RDEPEND="${DEPEND}
- sys-apps/gentoo-functions"
-
-src_prepare() {
- # make sure we always use system zlib
- rm -rf zlib || die
- epatch "${FILESDIR}"/${PN}-3.1.7-no-perl.patch #421609
- epatch "${FILESDIR}"/${PN}-3.1.10-size-on-disk.patch #456178
- sed \
- -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
- "${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_install() {
- DOCS=( AUTHORS.txt MANUAL.txt NEWS.txt README.txt )
- default
-
- dobin ccache-config
-
- 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 2.0.46-r11+ 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} ]] ; then
- "${EROOT}"/usr/bin/ccache-config --remove-links
- "${EROOT}"/usr/bin/ccache-config --remove-links ${CHOST}
- fi
-}
-
-pkg_postinst() {
- "${EROOT}"/usr/bin/ccache-config --install-links
- "${EROOT}"/usr/bin/ccache-config --install-links ${CHOST}
-
- # nuke broken symlinks from previous versions that shouldn't exist
- rm -f "${EROOT}"/usr/lib/ccache/bin/${CHOST}-cc || die
- rm -rf "${EROOT}"/usr/lib/ccache.backup || die
-
- readme.gentoo_print_elog
-}
diff --git a/dev-util/ccache/ccache-3.2.2.ebuild b/dev-util/ccache/ccache-3.2.2.ebuild
deleted file mode 100644
index 49b5179..0000000
--- a/dev-util/ccache/ccache-3.2.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils readme.gentoo
-
-DESCRIPTION="fast compiler cache"
-HOMEPAGE="http://ccache.samba.org/"
-SRC_URI="http://samba.org/ftp/ccache/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="app-arch/xz-utils
- sys-libs/zlib"
-RDEPEND="${DEPEND}
- sys-apps/gentoo-functions"
-
-src_prepare() {
- # make sure we always use system zlib
- rm -rf zlib || die
- epatch "${FILESDIR}"/${PN}-3.1.7-no-perl.patch #421609
- epatch "${FILESDIR}"/${PN}-3.1.10-size-on-disk.patch #456178
- sed \
- -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
- "${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_install() {
- DOCS=( AUTHORS.txt MANUAL.txt NEWS.txt README.txt )
- default
-
- dobin ccache-config
-
- 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 2.0.46-r11+ 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} ]] ; then
- "${EROOT}"/usr/bin/ccache-config --remove-links
- "${EROOT}"/usr/bin/ccache-config --remove-links ${CHOST}
- fi
-}
-
-pkg_postinst() {
- "${EROOT}"/usr/bin/ccache-config --install-links
- "${EROOT}"/usr/bin/ccache-config --install-links ${CHOST}
-
- # nuke broken symlinks from previous versions that shouldn't exist
- rm -f "${EROOT}"/usr/lib/ccache/bin/${CHOST}-cc || die
- rm -rf "${EROOT}"/usr/lib/ccache.backup || die
-
- readme.gentoo_print_elog
-}
diff --git a/dev-util/ccache/ccache-3.2.3.ebuild b/dev-util/ccache/ccache-3.2.3.ebuild
deleted file mode 100644
index a8d9ebd..0000000
--- a/dev-util/ccache/ccache-3.2.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils readme.gentoo
-
-DESCRIPTION="fast compiler cache"
-HOMEPAGE="http://ccache.samba.org/"
-SRC_URI="http://samba.org/ftp/ccache/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="app-arch/xz-utils
- sys-libs/zlib"
-RDEPEND="${DEPEND}
- sys-apps/gentoo-functions"
-
-src_prepare() {
- # make sure we always use system zlib
- rm -rf zlib || die
- epatch "${FILESDIR}"/${PN}-3.1.10-size-on-disk.patch #456178
- sed \
- -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
- "${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_install() {
- DOCS=( AUTHORS.txt MANUAL.txt NEWS.txt README.txt )
- default
-
- dobin ccache-config
-
- 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 2.0.46-r11+ 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} ]] ; then
- "${EROOT}"/usr/bin/ccache-config --remove-links
- "${EROOT}"/usr/bin/ccache-config --remove-links ${CHOST}
- fi
-}
-
-pkg_postinst() {
- "${EROOT}"/usr/bin/ccache-config --install-links
- "${EROOT}"/usr/bin/ccache-config --install-links ${CHOST}
-
- # nuke broken symlinks from previous versions that shouldn't exist
- rm -f "${EROOT}"/usr/lib/ccache/bin/${CHOST}-cc || die
- rm -rf "${EROOT}"/usr/lib/ccache.backup || die
-
- readme.gentoo_print_elog
-}
diff --git a/dev-util/ccache/files/ccache-2.4-profile.patch b/dev-util/ccache/files/ccache-2.4-profile.patch
deleted file mode 100644
index 5774321..0000000
--- a/dev-util/ccache/files/ccache-2.4-profile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-GCCs options -fprofile-generate and -fprofile-use are used for
-profile guided optimization. It depends on the ability to locate
-the profile data files (.gcda) after running the executable with
-the training data. However, ccache prevents the compiler from
-finding the correct profile data file. Therefore the following
-patch disables the caching when one of the
- -fprofile-generate
- -fprofile-use
- -fprofile-arcs
-flags is found.
-
-Signed-off-by: Clemens Rabe <crabe _at_ gmx _dot_ de>
-
-
-diff -Naur ccache-2.4.orig/ccache.c ccache-2.4/ccache.c
---- ccache-2.4.orig/ccache.c 2004-09-13 12:38:30.000000000 +0200
-+++ ccache-2.4/ccache.c 2008-01-07 20:25:38.000000000 +0100
-@@ -640,6 +640,9 @@
-
- /* these are too hard */
- if (strcmp(argv[i], "-fbranch-probabilities")==0 ||
-+ strcmp(argv[i], "-fprofile-generate")==0 ||
-+ strcmp(argv[i], "-fprofile-use")==0 ||
-+ strcmp(argv[i], "-fprofile-arcs")==0 ||
- strcmp(argv[i], "-M") == 0 ||
- strcmp(argv[i], "-MM") == 0 ||
- strcmp(argv[i], "-x") == 0) {
diff --git a/dev-util/ccache/files/ccache-2.4-respectflags.patch b/dev-util/ccache/files/ccache-2.4-respectflags.patch
deleted file mode 100644
index 38d5f6a..0000000
--- a/dev-util/ccache/files/ccache-2.4-respectflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: ccache-2.4/Makefile.in
-===================================================================
---- ccache-2.4.orig/Makefile.in
-+++ ccache-2.4/Makefile.in
-@@ -20,7 +20,7 @@ all: ccache$(EXEEXT)
- docs: ccache.1 web/ccache-man.html
-
- ccache$(EXEEXT): $(OBJS) $(HEADERS)
-- $(CC) $(CFLAGS) -o $@ $(OBJS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
-
- ccache.1: ccache.yo
- -yodl2man -o ccache.1 ccache.yo
diff --git a/dev-util/ccache/files/ccache-2.4-utimes.patch b/dev-util/ccache/files/ccache-2.4-utimes.patch
deleted file mode 100644
index 30aff6b..0000000
--- a/dev-util/ccache/files/ccache-2.4-utimes.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-utime(...,NULL) in some cases may cause truncation of sub-second portions of
-timestamps. If utimes(...,NULL) is available, use it instead to avoid this
-problem.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude autom4te.cache --exclude '*~' ccache-2.4.orig/ccache.c ccache-2.4/ccache.c
---- ccache-2.4.orig/ccache.c 2004-09-13 03:38:30.000000000 -0700
-+++ ccache-2.4/ccache.c 2006-06-09 16:29:16.695117780 -0700
-@@ -481,7 +481,11 @@
- return;
- }
-
-+#ifdef HAVE_UTIMES
-+ utimes(stderr_file, NULL);
-+#else
- utime(stderr_file, NULL);
-+#endif
-
- if (strcmp(output_file, "/dev/null") == 0) {
- ret = 0;
-@@ -515,7 +519,11 @@
- }
- if (ret == 0) {
- /* update the mtime on the file so that make doesn't get confused */
-+#ifdef HAVE_UTIMES
-+ utimes(output_file, NULL);
-+#else
- utime(output_file, NULL);
-+#endif
- }
-
- /* get rid of the intermediate preprocessor file */
-diff -Nuar --exclude autom4te.cache --exclude '*~' ccache-2.4.orig/ccache.h ccache-2.4/ccache.h
---- ccache-2.4.orig/ccache.h 2004-09-13 03:38:30.000000000 -0700
-+++ ccache-2.4/ccache.h 2006-06-09 16:28:16.601658626 -0700
-@@ -22,6 +22,9 @@
- #ifdef HAVE_PWD_H
- #include <pwd.h>
- #endif
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#endif
-
- #define STATUS_NOTFOUND 3
- #define STATUS_FATAL 4
-diff -Nuar --exclude autom4te.cache --exclude '*~' ccache-2.4.orig/config.h.in ccache-2.4/config.h.in
---- ccache-2.4.orig/config.h.in 2003-09-27 21:48:17.000000000 -0700
-+++ ccache-2.4/config.h.in 2006-06-09 16:25:43.000000000 -0700
-@@ -19,6 +19,9 @@
- /* Define to 1 if you have the `gethostname' function. */
- #undef HAVE_GETHOSTNAME
-
-+/* Define to 1 if you have the `getpwuid' function. */
-+#undef HAVE_GETPWUID
-+
- /* Define to 1 if you have the <inttypes.h> header file. */
- #undef HAVE_INTTYPES_H
-
-@@ -31,6 +34,9 @@
- /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
- #undef HAVE_NDIR_H
-
-+/* Define to 1 if you have the <pwd.h> header file. */
-+#undef HAVE_PWD_H
-+
- /* Define to 1 if you have the `realpath' function. */
- #undef HAVE_REALPATH
-
-@@ -60,6 +66,9 @@
- /* Define to 1 if you have the <sys/stat.h> header file. */
- #undef HAVE_SYS_STAT_H
-
-+/* Define to 1 if you have the <sys/time.h> header file. */
-+#undef HAVE_SYS_TIME_H
-+
- /* Define to 1 if you have the <sys/types.h> header file. */
- #undef HAVE_SYS_TYPES_H
-
-@@ -69,6 +78,9 @@
- /* Define to 1 if you have the <unistd.h> header file. */
- #undef HAVE_UNISTD_H
-
-+/* Define to 1 if you have the `utimes' function. */
-+#undef HAVE_UTIMES
-+
- /* Define to 1 if you have the `vasprintf' function. */
- #undef HAVE_VASPRINTF
-
-diff -Nuar --exclude autom4te.cache --exclude '*~' ccache-2.4.orig/configure.in ccache-2.4/configure.in
---- ccache-2.4.orig/configure.in 2004-09-13 03:38:30.000000000 -0700
-+++ ccache-2.4/configure.in 2006-06-09 16:25:15.541288184 -0700
-@@ -27,10 +27,11 @@
- AC_HEADER_TIME
- AC_HEADER_SYS_WAIT
-
--AC_CHECK_HEADERS(ctype.h strings.h stdlib.h string.h pwd.h)
-+AC_CHECK_HEADERS(ctype.h strings.h stdlib.h string.h pwd.h sys/time.h)
-
- AC_CHECK_FUNCS(realpath snprintf vsnprintf vasprintf asprintf mkstemp)
- AC_CHECK_FUNCS(gethostname getpwuid)
-+AC_CHECK_FUNCS(utimes)
-
- AC_CACHE_CHECK([for compar_fn_t in stdlib.h],ccache_cv_COMPAR_FN_T, [
- AC_TRY_COMPILE(
diff --git a/dev-util/ccache/files/ccache-2.4-xrealloc.patch b/dev-util/ccache/files/ccache-2.4-xrealloc.patch
deleted file mode 100644
index 8e2d44d..0000000
--- a/dev-util/ccache/files/ccache-2.4-xrealloc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://bugzilla.samba.org/show_bug.cgi?id=7090
-https://bugs.gentoo.org/338137
-
-From 52a9cd8eb8a69f9dc6944c047faf112b7137a07b Mon Sep 17 00:00:00 2001
-From: Andrew Tridgell <tridge@samba.org>
-Date: Mon, 17 Jul 2006 05:41:12 +0200
-Subject: [PATCH] fixed a bug in x_realloc()
-
----
- util.c | 6 +-----
- 1 files changed, 1 insertions(+), 5 deletions(-)
-
-diff --git a/util.c b/util.c
-index 073fa81..29d0e5b 100644
---- a/util.c
-+++ b/util.c
-@@ -187,14 +187,10 @@ void *x_realloc(void *ptr, size_t size)
- {
- void *p2;
- if (!ptr) return x_malloc(size);
-- p2 = malloc(size);
-+ p2 = realloc(ptr, size);
- if (!p2) {
- fatal("out of memory in x_realloc");
- }
-- if (ptr) {
-- memcpy(p2, ptr, size);
-- free(ptr);
-- }
- return p2;
- }
-
---
-1.7.3.1
-
diff --git a/dev-util/ccache/files/ccache-3.1.10-real-temp-files.patch b/dev-util/ccache/files/ccache-3.1.10-real-temp-files.patch
deleted file mode 100644
index 45e6541..0000000
--- a/dev-util/ccache/files/ccache-3.1.10-real-temp-files.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-https://lists.samba.org/archive/ccache/2014q4/001246.html
-
-From 5d0f507a4162ac89e05ca633dbc8056454b798f5 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 15 Sep 2014 18:15:02 -0400
-Subject: [PATCH] do not rely on pids being unique
-
-Linux supports creating pid namespaces cheaply and running processes
-inside of them. When you try to share a single cache among multiple
-such runs, the fact that the code relies on pid numbers as globally
-unique values quickly fails. Instead, switch to standard mkstemp to
-generate temp files for us.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- ccache.c | 12 ++++++------
- ccache.h | 2 +-
- manifest.c | 2 +-
- stats.c | 10 +++++++++-
- util.c | 13 ++++++++-----
- 5 files changed, 25 insertions(+), 14 deletions(-)
-
-diff --git a/ccache.c b/ccache.c
-index 02dbdfa..1dc0a06 100644
---- a/ccache.c
-+++ b/ccache.c
-@@ -526,8 +526,11 @@ to_cache(struct args *args)
- unsigned added_files = 0;
-
- tmp_stdout = format("%s.tmp.stdout.%s", cached_obj, tmp_string());
-+ create_empty_file(tmp_stdout);
- tmp_stderr = format("%s.tmp.stderr.%s", cached_obj, tmp_string());
-+ create_empty_file(tmp_stderr);
- tmp_obj = format("%s.tmp.%s", cached_obj, tmp_string());
-+ create_empty_file(tmp_obj);
-
- args_add(args, "-o");
- args_add(args, tmp_obj);
-@@ -579,7 +582,7 @@ to_cache(struct args *args)
- int fd_result;
- char *tmp_stderr2;
-
-- tmp_stderr2 = format("%s.tmp.stderr2.%s", cached_obj, tmp_string());
-+ tmp_stderr2 = format("%s.2", tmp_stderr);
- if (x_rename(tmp_stderr, tmp_stderr2)) {
- cc_log("Failed to rename %s to %s: %s", tmp_stderr, tmp_stderr2,
- strerror(errno));
-@@ -808,6 +808,7 @@ get_object_name_from_cpp(struct args *args, struct mdfour *hash)
- }
-
- path_stderr = format("%s/tmp.cpp_stderr.%s", temp_dir, tmp_string());
-+ create_empty_file(path_stderr);
- add_pending_tmp_file(path_stderr);
-
- time_of_compilation = time(NULL);
-@@ -815,6 +816,7 @@ get_object_name_from_cpp(struct args *args, struct mdfour *hash)
- if (!direct_i_file) {
- path_stdout = format("%s/%s.tmp.%s.%s",
- temp_dir, input_base, tmp_string(), i_extension);
-+ create_empty_file(path_stdout);
- add_pending_tmp_file(path_stdout);
-
- /* run cpp on the input file to obtain the .i */
-@@ -838,11 +843,6 @@ get_object_name_from_cpp(struct args *args, struct mdfour *hash)
- can skip the cpp stage and directly form the
- correct i_tmpfile */
- path_stdout = input_file;
-- if (create_empty_file(path_stderr) != 0) {
-- cc_log("Failed to create %s: %s", path_stderr, strerror(errno));
-- stats_update(STATS_ERROR);
-- failed();
-- }
- status = 0;
- }
-
-diff --git a/ccache.h b/ccache.h
-index 2bc7c87..43ef98d 100644
---- a/ccache.h
-+++ b/ccache.h
-@@ -130,7 +130,7 @@ size_t file_size(struct stat *st);
- int safe_open(const char *fname);
- char *x_realpath(const char *path);
- char *gnu_getcwd(void);
--int create_empty_file(const char *fname);
-+int create_empty_file(char *fname);
- const char *get_home_directory(void);
- char *get_cwd();
- bool same_executable_name(const char *s1, const char *s2);
-diff --git a/manifest.c b/manifest.c
-index 7f02ede..47566d5 100644
---- a/manifest.c
-+++ b/manifest.c
-@@ -633,7 +633,7 @@ manifest_put(const char *manifest_path, struct file_hash *object_hash,
- }
-
- tmp_file = format("%s.tmp.%s", manifest_path, tmp_string());
-- fd2 = safe_open(tmp_file);
-+ fd2 = mkstemp(tmp_file);
- if (fd2 == -1) {
- cc_log("Failed to open %s", tmp_file);
- goto out;
-diff --git a/stats.c b/stats.c
-index 2111b65..4ed39c2 100644
---- a/stats.c
-+++ b/stats.c
-@@ -126,11 +126,18 @@ stats_write(const char *path, struct counters *counters)
- size_t i;
- char *tmp_file;
- FILE *f;
-+ int fd;
-
- tmp_file = format("%s.tmp.%s", path, tmp_string());
-- f = fopen(tmp_file, "wb");
-+ fd = mkstemp(tmp_file);
-+ if (fd == -1) {
-+ cc_log("Failed to open %s", tmp_file);
-+ goto end;
-+ }
-+ f = fdopen(fd, "wb");
- if (!f) {
- cc_log("Failed to open %s", tmp_file);
-+ close(fd);
- goto end;
- }
- for (i = 0; i < counters->size; i++) {
-@@ -138,6 +145,7 @@ stats_write(const char *path, struct counters *counters)
- fatal("Failed to write to %s", tmp_file);
- }
- }
-+ /* This also implicitly closes the fd. */
- fclose(f);
- x_rename(tmp_file, path);
-
-diff --git a/util.c b/util.c
-index 3b472de..cc630a6 100644
---- a/util.c
-+++ b/util.c
-@@ -195,7 +195,7 @@ copy_file(const char *src, const char *dest, int compress_dest)
- struct stat st;
- int errnum;
-
-- tmp_name = format("%s.%s.XXXXXX", dest, tmp_string());
-+ tmp_name = format("%s.%s", dest, tmp_string());
- cc_log("Copying %s to %s via %s (%s)",
- src, dest, tmp_name, compress_dest ? "compressed": "uncompressed");
-
-@@ -427,7 +427,7 @@ tmp_string(void)
- static char *ret;
-
- if (!ret) {
-- ret = format("%s.%u", get_hostname(), (unsigned)getpid());
-+ ret = format("%s.%u.XXXXXX", get_hostname(), (unsigned)getpid());
- }
-
- return ret;
-@@ -884,12 +884,13 @@ gnu_getcwd(void)
-
- /* create an empty file */
- int
--create_empty_file(const char *fname)
-+create_empty_file(char *fname)
- {
- int fd;
-
-- fd = open(fname, O_WRONLY|O_CREAT|O_TRUNC|O_EXCL|O_BINARY, 0666);
-+ fd = mkstemp(fname);
- if (fd == -1) {
-+ cc_log("Failed to create %s: %s", fname, strerror(errno));
- return -1;
- }
- close(fd);
-@@ -1134,7 +1135,9 @@ x_unlink(const char *path)
- goto out;
- }
- if (unlink(tmp_name) == -1) {
-- result = -1;
-+ /* If it was released in a race, that's OK. */
-+ if (errno != ENOENT)
-+ result = -1;
- }
- out:
- free(tmp_name);
---
-2.1.2
-
diff --git a/dev-util/ccache/files/ccache-3.1.7-no-perl.patch b/dev-util/ccache/files/ccache-3.1.7-no-perl.patch
deleted file mode 100644
index 5abd15e..0000000
--- a/dev-util/ccache/files/ccache-3.1.7-no-perl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-avoid weak perl usage in tests
-
-https://bugs.gentoo.org/421609
-
---- a/test.sh
-+++ b/test.sh
-@@ -1466,7 +1466,7 @@
- mkdir -p $dir
- i=0
- while [ $i -lt 10 ]; do
-- perl -e 'print "A" x 4017' >$dir/result$i-4017.o
-+ printf '%4017s' '' | tr ' ' 'A' >$dir/result$i-4017.o
- touch $dir/result$i-4017.stderr
- touch $dir/result$i-4017.d
- if [ $i -gt 5 ]; then
diff --git a/dev-util/ccache/files/ccache-3.1.9-test-gcc-4.8.patch b/dev-util/ccache/files/ccache-3.1.9-test-gcc-4.8.patch
deleted file mode 100644
index 2a28baf..0000000
--- a/dev-util/ccache/files/ccache-3.1.9-test-gcc-4.8.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-https://bugs.gentoo.org/461966
-
-fix from upstream
-
-From b5d63f81c1a83fd4c50b769a96a04f581b7db70c Mon Sep 17 00:00:00 2001
-From: Joel Rosdahl <joel@rosdahl.net>
-Date: Wed, 20 Mar 2013 22:18:16 +0100
-Subject: [PATCH] Fix test suite failure on GCC 4.8
-
-GCC 4.8 includes /usr/include/stdc-predef.h implicitly, and this shows up
-in generated .d files.
----
- test.sh | 35 +++++++++++++++++++----------------
- 1 file changed, 19 insertions(+), 16 deletions(-)
-
-diff --git a/test.sh b/test.sh
-index 3ed9069..3e38387 100755
---- a/test.sh
-+++ b/test.sh
-@@ -3,7 +3,7 @@
- # A simple test suite for ccache.
- #
- # Copyright (C) 2002-2007 Andrew Tridgell
--# Copyright (C) 2009-2012 Joel Rosdahl
-+# Copyright (C) 2009-2013 Joel Rosdahl
- #
- # This program is free software; you can redistribute it and/or modify it under
- # the terms of the GNU General Public License as published by the Free Software
-@@ -562,6 +562,9 @@ int test3;
- EOF
- backdate test1.h test2.h test3.h
-
-+ $COMPILER -c -Wp,-MD,expected.d test.c
-+ expected_d_content=`cat expected.d`
-+
- ##################################################################
- # First compilation is a miss.
- testname="first compilation"
-@@ -677,7 +680,7 @@ EOF
- checkstat 'cache hit (direct)' 0
- checkstat 'cache hit (preprocessed)' 0
- checkstat 'cache miss' 1
-- checkfile other.d "test.o: test.c test1.h test3.h test2.h"
-+ checkfile other.d "$expected_d_content"
-
- rm -f other.d
-
-@@ -685,7 +688,7 @@ EOF
- checkstat 'cache hit (direct)' 1
- checkstat 'cache hit (preprocessed)' 0
- checkstat 'cache miss' 1
-- checkfile other.d "test.o: test.c test1.h test3.h test2.h"
-+ checkfile other.d "$expected_d_content"
-
- rm -f other.d
-
-@@ -760,7 +763,7 @@ EOF
- checkstat 'cache hit (direct)' 0
- checkstat 'cache hit (preprocessed)' 0
- checkstat 'cache miss' 1
-- checkfile test.d "test.o: test.c test1.h test3.h test2.h"
-+ checkfile test.d "$expected_d_content"
-
- rm -f test.d
-
-@@ -768,7 +771,7 @@ EOF
- checkstat 'cache hit (direct)' 1
- checkstat 'cache hit (preprocessed)' 0
- checkstat 'cache miss' 1
-- checkfile test.d "test.o: test.c test1.h test3.h test2.h"
-+ checkfile test.d "$expected_d_content"
-
- ##################################################################
- # Check the scenario of running a ccache with direct mode on a cache
-@@ -780,7 +783,7 @@ EOF
- checkstat 'cache hit (direct)' 0
- checkstat 'cache hit (preprocessed)' 0
- checkstat 'cache miss' 1
-- checkfile test.d "test.o: test.c test1.h test3.h test2.h"
-+ checkfile test.d "$expected_d_content"
-
- rm -f test.d
-
-@@ -788,7 +791,7 @@ EOF
- checkstat 'cache hit (direct)' 0
- checkstat 'cache hit (preprocessed)' 1
- checkstat 'cache miss' 1
-- checkfile test.d "test.o: test.c test1.h test3.h test2.h"
-+ checkfile test.d "$expected_d_content"
-
- rm -f test.d
-
-@@ -796,7 +799,7 @@ EOF
- checkstat 'cache hit (direct)' 0
- checkstat 'cache hit (preprocessed)' 2
- checkstat 'cache miss' 1
-- checkfile test.d "test.o: test.c test1.h test3.h test2.h"
-+ checkfile test.d "$expected_d_content"
-
- rm -f test.d
-
-@@ -804,7 +807,7 @@ EOF
- checkstat 'cache hit (direct)' 1
- checkstat 'cache hit (preprocessed)' 2
- checkstat 'cache miss' 1
-- checkfile test.d "test.o: test.c test1.h test3.h test2.h"
-+ checkfile test.d "$expected_d_content"
-
- ##################################################################
- # Check that -MF works.
-@@ -815,7 +818,7 @@ EOF
- checkstat 'cache hit (direct)' 0
- checkstat 'cache hit (preprocessed)' 0
- checkstat 'cache miss' 1
-- checkfile other.d "test.o: test.c test1.h test3.h test2.h"
-+ checkfile other.d "$expected_d_content"
-
- rm -f other.d
-
-@@ -823,7 +826,7 @@ EOF
- checkstat 'cache hit (direct)' 1
- checkstat 'cache hit (preprocessed)' 0
- checkstat 'cache miss' 1
-- checkfile other.d "test.o: test.c test1.h test3.h test2.h"
-+ checkfile other.d "$expected_d_content"
-
- ##################################################################
- # Check that a missing .d file in the cache is handled correctly.
-@@ -835,13 +838,13 @@ EOF
- checkstat 'cache hit (direct)' 0
- checkstat 'cache hit (preprocessed)' 0
- checkstat 'cache miss' 1
-- checkfile other.d "test.o: test.c test1.h test3.h test2.h"
-+ checkfile other.d "$expected_d_content"
-
- $CCACHE $COMPILER -c -MD test.c
- checkstat 'cache hit (direct)' 1
- checkstat 'cache hit (preprocessed)' 0
- checkstat 'cache miss' 1
-- checkfile other.d "test.o: test.c test1.h test3.h test2.h"
-+ checkfile other.d "$expected_d_content"
-
- find $CCACHE_DIR -name '*.d' -exec rm -f '{}' \;
-
-@@ -849,7 +852,7 @@ EOF
- checkstat 'cache hit (direct)' 1
- checkstat 'cache hit (preprocessed)' 1
- checkstat 'cache miss' 1
-- checkfile other.d "test.o: test.c test1.h test3.h test2.h"
-+ checkfile other.d "$expected_d_content"
-
- ##################################################################
- # Check that stderr from both the preprocessor and the compiler is emitted
---
-1.8.1.2
-
diff --git a/dev-util/ccache/files/ccache-config b/dev-util/ccache/files/ccache-config
deleted file mode 100644
index a7dc4a0..0000000
--- a/dev-util/ccache/files/ccache-config
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-#
-# ccache-config - helper script for ccache and its ebuild
-#
-# Copyright 2003-2014 Superlucidity Services, LLC
-# This program licensed under the GNU GPL version 2.
-#
-# This script developed by Zachary T Welch at Superlucidity Services, LLC
-# it was cloned from the distcc-config script
-#
-# Additional features to come; this provides a starting point
-
-. /etc/init.d/functions.sh 2>/dev/null || {
- ebegin() { echo " * $* ..."; }
- eend() {
- local r=${1:-$?}
- [ ${r} -eq 0 ] && echo " [ OK ]" || echo " [ !! ]"
- return $r
- }
-}
-
-LIBDIR="lib"
-
-# this should be getopt'd someday (override with CC_QUIET=1)
-CC_VERBOSE=1
-unset _CC_QUIET
-c_quiet() {
- [ -n "${CC_QUIET:-${_CC_QUIET}}" ] || [ -z "${CC_VERBOSE}" ]
-}
-
-c_ebegin() { c_quiet || ebegin "$@" ; }
-c_eend() { c_quiet || eend "$@" ; }
-
-###
-# the following functions manage the ccache symlinks
-# they allow the user or other scripts (namely gcc-config) to
-# automatically update ccache's links when upgrading toolchains
-#
-cc_path() {
- echo ${ROOT%/}/usr/${LIBDIR}/ccache/bin/$1
-}
-cc_remove_link() {
- local t=$(cc_path "$1")
- if [ -L ${t} ]; then
- c_ebegin "Removing ${t}"
- rm -f "${t}"
- c_eend
-
- # Trim the empty dir if possible. #517242
- t=${t%/*}
- if rmdir "${t}" 2>/dev/null; then
- rmdir "${t%/*}" 2>/dev/null
- fi
- :
- fi
-}
-cc_install_link() {
- # Search the PATH for the specified compiler
- # then create shadow link in /usr/lib/ccache/bin to ccache
-
- if [ -n "$(type -p ${1})" ]; then
- # first be sure any old link is removed
- _CC_QUIET=1
- cc_remove_link "${1}"
- unset _CC_QUIET
-
- # then create the new link
- local t=$(cc_path "$1")
- c_ebegin "Creating ccache shadow link ${t}"
- mkdir -p -m 0755 "${t%/*}" && ln -s /usr/bin/ccache "${t}"
- c_eend
- fi
-}
-cc_links() {
- local a
- for a in gcc cc c++ g++ ; do
- if [ -n "${2}" ] ; then
- # gcc-config doesnt install ${CHOST}-cc, so until
- # it does, don't install a ccache symlink for it
- [ "${a}" = "cc" ] && continue
- a="${2}-${a}"
- fi
- "cc_${1}_link" "${a}"
- done
-}
-
-###
-# main routine
-
-case "${1}" in
- --install-links )
- cc_links install "${2}"
- ;;
- --remove-links )
- cc_links remove "${2}"
- ;;
- * )
- echo "usage: ${0} {--install-links|--remove-links} [ CHOST ]"
- ;;
-esac
diff --git a/dev-util/ccache/files/ccache-config-2 b/dev-util/ccache/files/ccache-config-2
deleted file mode 100644
index 914f095..0000000
--- a/dev-util/ccache/files/ccache-config-2
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/sh
-#
-# ccache-config - helper script for ccache and its ebuild
-#
-# Copyright 2003-2014 Superlucidity Services, LLC
-# Copyright 2013-2014 Gentoo Foundation
-# This program licensed under the GNU GPL version 2.
-#
-# This script developed by Zachary T Welch at Superlucidity Services, LLC
-# it was cloned from the distcc-config script
-#
-# Additional features to come; this provides a starting point
-
-EPREFIX=''
-
-. "${EPREFIX}"/etc/init.d/functions.sh 2>/dev/null || {
- ebegin() { echo " * $* ..."; }
- eend() {
- local r=${1:-$?}
- [ ${r} -eq 0 ] && echo " [ OK ]" || echo " [ !! ]"
- return $r
- }
-}
-
-LIBDIR="lib"
-
-# this should be getopt'd someday (override with CC_QUIET=1)
-CC_VERBOSE=1
-unset _CC_QUIET
-c_quiet() {
- [ -n "${CC_QUIET:-${_CC_QUIET}}" ] || [ -z "${CC_VERBOSE}" ]
-}
-
-c_ebegin() { c_quiet || ebegin "$@" ; }
-c_eend() { c_quiet || eend "$@" ; }
-
-###
-# the following functions manage the ccache symlinks
-# they allow the user or other scripts (namely gcc-config) to
-# automatically update ccache's links when upgrading toolchains
-#
-cc_path() {
- echo ${ROOT%/}${EPREFIX}/usr/${LIBDIR}/ccache/bin/$1
-}
-cc_remove_link() {
- local t=$(cc_path "$1")
- if [ -L ${t} ]; then
- c_ebegin "Removing ${t}"
- rm -f "${t}"
- c_eend
-
- # Trim the empty dir if possible. #517242
- t=${t%/*}
- if rmdir "${t}" 2>/dev/null; then
- rmdir "${t%/*}" 2>/dev/null
- fi
- :
- fi
-}
-cc_install_link() {
- # Search the PATH for the specified compiler
- # then create shadow link in /usr/lib/ccache/bin to ccache
-
- if command -v "$1" >/dev/null ; then
- # first be sure any old link is removed
- _CC_QUIET=1
- cc_remove_link "$1"
- unset _CC_QUIET
-
- # then create the new link
- local t=$(cc_path "$1")
- c_ebegin "Creating ccache shadow link ${t}"
- mkdir -p -m 0755 "${t%/*}" && ln -s "${EPREFIX}"/usr/bin/ccache "${t}"
- c_eend
- fi
-}
-cc_links() {
- local a
- for a in gcc cc c++ g++ icc icpc clang clang++ ; do
- "cc_${1}_link" "${2}${2:+-}${a}"
- done
-}
-
-###
-# main routine
-
-case $1 in
- --install-links )
- cc_links install "$2"
- ;;
- --remove-links )
- cc_links remove "$2"
- ;;
- * )
- echo "usage: $0 {--install-links|--remove-links} [ CHOST ]"
- ;;
-esac
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/
@ 2018-08-15 8:39 Sergei Trofimovich
0 siblings, 0 replies; 19+ messages in thread
From: Sergei Trofimovich @ 2018-08-15 8:39 UTC (permalink / raw
To: gentoo-commits
commit: c28e489ab53d41813fe75a8a00e939ccffabd80f
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 15 08:16:09 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Aug 15 08:39:02 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c28e489a
dev-util/ccache: bump up to 3.4.2, bug #647200
Reported-by: Perfect Gentleman
Closes: https://bugs.gentoo.org/647200
Package-Manager: Portage-2.3.46, Repoman-2.3.10
dev-util/ccache/Manifest | 1 +
dev-util/ccache/ccache-3.4.2.ebuild | 74 ++++++++++++++++++++++
.../ccache/files/ccache-3.4-size-on-disk.patch | 21 ++++++
3 files changed, 96 insertions(+)
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 5e34ecc37de..040b0e26bd3 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,2 +1,3 @@
DIST ccache-3.2.4.tar.xz 302548 BLAKE2B 7d642dc3f944183660e79cfdfd68948528aa3ea4ef8162a4d04837c85ccace35107e663ec81a15438dab133fca2e8bf100fecd483f33c9b0aa52c68989ae8122 SHA512 d048b70804c81dece97f3ba511b3c109ec0d14e7dca69bc68faeeb61a4a7b5639c03e3e5ad7dad4e42b4bd198d7a7fffa4e3b7ef99590dfd4df0805db6c25db7
DIST ccache-3.3.4.tar.xz 314468 BLAKE2B 6e465598df428979a2c821a698afef25c05d09045cbb54ec54cc3b65b8ce6416b6eb46fae0cf5d60f766129cef11eb01410b522318c67416fdf47f6e8fceae66 SHA512 891bcf11b27fa20a250bc86d182663e46af450a3a807b6cab502f202cd57123ce93bcb1fe5e48866feecda76912a5f742efa5869df9117d81624ba185dd4e02c
+DIST ccache-3.4.2.tar.xz 324340 BLAKE2B e49582b4ff254dd4cd210634342d7b21d5c099892d4c7f3240122a3b9de013477f6c440eaf73d06fc0445020e225562528babfb41d10ca1fab68052c1e726531 SHA512 9bf07269df6785bb92758093f46f3be4df45de532e431e0bc3a68a7170d1782376a9b4495acf77569549062c84f61621c21c5d200e271cd064dbda4a73276f8e
diff --git a/dev-util/ccache/ccache-3.4.2.ebuild b/dev-util/ccache/ccache-3.4.2.ebuild
new file mode 100644
index 00000000000..25d07d629e1
--- /dev/null
+++ b/dev-util/ccache/ccache-3.4.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit readme.gentoo-r1
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="https://ccache.samba.org/"
+SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+DEPEND="app-arch/xz-utils
+ sys-libs/zlib"
+RDEPEND="${DEPEND}
+ dev-util/shadowman
+ sys-apps/gentoo-functions"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.4-size-on-disk.patch #456178
+)
+
+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_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 2.0.46-r11+ 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.4-size-on-disk.patch b/dev-util/ccache/files/ccache-3.4-size-on-disk.patch
new file mode 100644
index 00000000000..4f39a0348f2
--- /dev/null
+++ b/dev-util/ccache/files/ccache-3.4-size-on-disk.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/56178
+
+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/src/util.c
++++ b/src/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
+ }
+
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/
@ 2018-10-15 21:13 Sergei Trofimovich
0 siblings, 0 replies; 19+ messages in thread
From: Sergei Trofimovich @ 2018-10-15 21:13 UTC (permalink / raw
To: gentoo-commits
commit: 3da825677c3cbf7385055a047f2b2801f34fc31f
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 15 21:13:00 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Oct 15 21:13:29 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3da82567
dev-util/ccache: disable nvcc tests
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-util/ccache/ccache-3.5.ebuild | 1 +
dev-util/ccache/files/ccache-3.5-nvcc-test.patch | 11 +++++++++++
2 files changed, 12 insertions(+)
diff --git a/dev-util/ccache/ccache-3.5.ebuild b/dev-util/ccache/ccache-3.5.ebuild
index ea736149c66..e2a525cad94 100644
--- a/dev-util/ccache/ccache-3.5.ebuild
+++ b/dev-util/ccache/ccache-3.5.ebuild
@@ -22,6 +22,7 @@ RDEPEND="${DEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-3.4-size-on-disk.patch #456178
+ "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
)
src_prepare() {
diff --git a/dev-util/ccache/files/ccache-3.5-nvcc-test.patch b/dev-util/ccache/files/ccache-3.5-nvcc-test.patch
new file mode 100644
index 00000000000..294b2243907
--- /dev/null
+++ b/dev-util/ccache/files/ccache-3.5-nvcc-test.patch
@@ -0,0 +1,11 @@
+Disable 'nvcc' tests to avoid test failure
+on system with gcc-7+ enabled by default.
+--- a/test/run
++++ b/test/run
+@@ -425,2 +425,6 @@ else
+ fi
++# Disable nvcc tests in Gentoo as nvcc requires gcc<7.
++# Not a default normally.
++REAL_NVCC=
++REAL_CUOBJDUMP=
+ echo
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/
@ 2019-01-04 21:13 Sergei Trofimovich
0 siblings, 0 replies; 19+ messages in thread
From: Sergei Trofimovich @ 2019-01-04 21:13 UTC (permalink / raw
To: gentoo-commits
commit: be5c4a9d9cda0adbb1734314bbeadb0ece0eabe6
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 4 21:12:56 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jan 4 21:13:41 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be5c4a9d
dev-util/ccache: bump up to 3.5.1a, bug #674516
Reported-by: Dan Goodliffe
Closes: https://bugs.gentoo.org/674516
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-util/ccache/Manifest | 2 +-
.../{ccache-3.5.1.ebuild => ccache-3.5.1a.ebuild} | 3 ++-
dev-util/ccache/files/ccache-3.5.1-configure.patch | 19 -------------------
3 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 84c68dd998d..a317bc0c7bb 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,4 +1,4 @@
DIST ccache-3.2.4.tar.xz 302548 BLAKE2B 7d642dc3f944183660e79cfdfd68948528aa3ea4ef8162a4d04837c85ccace35107e663ec81a15438dab133fca2e8bf100fecd483f33c9b0aa52c68989ae8122 SHA512 d048b70804c81dece97f3ba511b3c109ec0d14e7dca69bc68faeeb61a4a7b5639c03e3e5ad7dad4e42b4bd198d7a7fffa4e3b7ef99590dfd4df0805db6c25db7
DIST ccache-3.3.4.tar.xz 314468 BLAKE2B 6e465598df428979a2c821a698afef25c05d09045cbb54ec54cc3b65b8ce6416b6eb46fae0cf5d60f766129cef11eb01410b522318c67416fdf47f6e8fceae66 SHA512 891bcf11b27fa20a250bc86d182663e46af450a3a807b6cab502f202cd57123ce93bcb1fe5e48866feecda76912a5f742efa5869df9117d81624ba185dd4e02c
-DIST ccache-3.5.1.tar.xz 335988 BLAKE2B f9cb8d48b16ebf48a409af6e69f16606e543144781b9988f25f5031dd7c4137709e32f76f6ae8879aef425064e6dce112195849008f2dcc9b6deb39d2726cae5 SHA512 25956ac68f24b3a443d9cf74fe759d9d5946e2f2188d40538a31d383550c6674c22f7e9290ceb71f1ee3987ed8f2802343a5a137b2f68692008ead3a347761af
+DIST ccache-3.5.1a.tar.xz 335888 BLAKE2B 66c044b39dd42c91327e02528a4d6c917ac012c2d08190f7dbc2029ed6d1525aa3a6262fb7528f1721cec510306baa59b498a5afbcf955bb6aaf13594c00d178 SHA512 8a2e9eb06ba21fcf92084afd94fc221168693de545e0448f4da2098bef2bcbfdb017117c325b0bab4931b9e346dd8c1a9d1ebaed0cdc36496d9452985cdd1b43
DIST ccache-3.5.tar.xz 334668 BLAKE2B e3e2b63e8c4c8074514fb3a5794325fa05a4d52f48fc436ab0ad21b643ca4d1a1502c989cb47ed68972b105d4f1642e4fadc5ecef1235fe2bd3be5d218094a79 SHA512 92181fb794f06dc231baa4193c37e8f1d844c9281fd64bcb8f4b35c87b4a88dfc9bf36b810b37151ee85699778fcd3783818949a7010e619aeca7e3b33b7a2e3
diff --git a/dev-util/ccache/ccache-3.5.1.ebuild b/dev-util/ccache/ccache-3.5.1a.ebuild
similarity index 97%
rename from dev-util/ccache/ccache-3.5.1.ebuild
rename to dev-util/ccache/ccache-3.5.1a.ebuild
index b57ecc61aab..7491315da2e 100644
--- a/dev-util/ccache/ccache-3.5.1.ebuild
+++ b/dev-util/ccache/ccache-3.5.1a.ebuild
@@ -23,9 +23,10 @@ RDEPEND="${DEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-3.4-size-on-disk.patch #456178
"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
- "${FILESDIR}"/${PN}-3.5.1-configure.patch
)
+S=${WORKDIR}/${P%a} # 3.5.1a->3.5.1, bug #674516
+
src_prepare() {
default
diff --git a/dev-util/ccache/files/ccache-3.5.1-configure.patch b/dev-util/ccache/files/ccache-3.5.1-configure.patch
deleted file mode 100644
index b3e1a29670a..00000000000
--- a/dev-util/ccache/files/ccache-3.5.1-configure.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/ccache/ccache/issues/344
-
---- a/configure
-+++ b/configure
-@@ -642,4 +642,5 @@ no_implicit_fallthrough_warning
- more_warnings
- include_dev_mk
-+getopt_long_c
- extra_libs
- disable_man
-@@ -4724,4 +4725,8 @@ done
-
-
-+if test x"$ac_cv_func_getopt_long" != x"yes"; then
-+ getopt_long_c="src/getopt_long.c"
-+fi
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compar_fn_t in stdlib.h" >&5
- $as_echo_n "checking for compar_fn_t in stdlib.h... " >&6; }
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/
@ 2019-02-02 23:40 Sergei Trofimovich
0 siblings, 0 replies; 19+ messages in thread
From: Sergei Trofimovich @ 2019-02-02 23:40 UTC (permalink / raw
To: gentoo-commits
commit: ce56476566e14b4d21c3ce07de83308f6433ecc7
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 2 23:39:40 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Feb 2 23:40:01 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce564765
dev-util/ccache: disable size cleanup test, bug #649440
Disable "Forced cache cleanup, size limit" test as it
relies on stable block size of filesystem where tests
are performed. Assumption does not hold true for ecryptfs
and btrfs. Disable test.
Reported-by: Michał Górny
Closes: https://bugs.gentoo.org/649440
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-util/ccache/ccache-3.6.ebuild | 1 +
.../files/ccache-3.6-disable-sized-cleanup.patch | 25 ++++++++++++++++++++++
2 files changed, 26 insertions(+)
diff --git a/dev-util/ccache/ccache-3.6.ebuild b/dev-util/ccache/ccache-3.6.ebuild
index 105a8bada3e..c5335c505f3 100644
--- a/dev-util/ccache/ccache-3.6.ebuild
+++ b/dev-util/ccache/ccache-3.6.ebuild
@@ -23,6 +23,7 @@ RDEPEND="${DEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-3.4-size-on-disk.patch #456178
"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+ "${FILESDIR}"/${PN}-3.6-disable-sized-cleanup.patch #649440
)
src_prepare() {
diff --git a/dev-util/ccache/files/ccache-3.6-disable-sized-cleanup.patch b/dev-util/ccache/files/ccache-3.6-disable-sized-cleanup.patch
new file mode 100644
index 00000000000..2b12542d26f
--- /dev/null
+++ b/dev-util/ccache/files/ccache-3.6-disable-sized-cleanup.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/649440
+
+Disable cleanup based on free filesystem size.
+
+--- a/test/suites/cleanup.bash
++++ b/test/suites/cleanup.bash
+@@ -75,6 +75,9 @@ SUITE_cleanup() {
+ done
+
+ # -------------------------------------------------------------------------
++# Disable test in Gentoo as we don't control temporary filesystem:
++# https://bugs.gentoo.org/649440
++if false; then
+ TEST "Forced cache cleanup, size limit"
+
+ # NOTE: This test is known to fail on filesystems that have unusual block
+@@ -101,7 +104,7 @@ SUITE_cleanup() {
+ file=$CCACHE_DIR/a/result$i-4017.o
+ expect_file_exists $file
+ done
+-
++fi
+ # -------------------------------------------------------------------------
+ TEST "Automatic cache cleanup, limit_multiple 0.9"
+
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/
@ 2020-10-19 18:49 Sergei Trofimovich
0 siblings, 0 replies; 19+ messages in thread
From: Sergei Trofimovich @ 2020-10-19 18:49 UTC (permalink / raw
To: gentoo-commits
commit: b56cb58add4cebf0e0a8828a253fd193a9be262c
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 18:29:29 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Oct 19 18:49:27 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b56cb58a
dev-util/ccache: bump up to 4.0
A few major changes:
- move from zlib to zstdd compression
- move from md4 to xxhash hash
- expanded license from GPL-3 to LGPL-3
- man page disappeared
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-util/ccache/Manifest | 1 +
dev-util/ccache/ccache-4.0.ebuild | 66 ++++++++++++++++++++++
.../ccache/files/ccache-4.0-avoid-run-user.patch | 18 ++++++
dev-util/ccache/files/ccache-4.0-objdump.patch | 12 ++++
4 files changed, 97 insertions(+)
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index eb12073ed68..d86d278e755 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,2 +1,3 @@
DIST ccache-3.7.11.tar.xz 354160 BLAKE2B 46fc5d65d6224bb796db7632b35ccca1089e5fed36eeb2ba231cf4c1aaa94be10bf0504f6ef565ce11673e527e09dee64583a764062ca7fea38364d790dd8cc1 SHA512 47b71b3ab4b89bf9b6f6d15941c22d2207b369922f51f9a8fbf4e86554325053dccce669e1c1ed3c0019a7e0a3d610f399e52d3fee68b56111aa7c1b24132c11
DIST ccache-3.7.12.tar.xz 354684 BLAKE2B b0b1028ede8206622c4b563cdc1351bdbe49ac11aa92d405c778af91db5bac029f7331371ef0a55bc3b1c7a0b60fbc5711277e048481bf0f4ad4b1be8acd3495 SHA512 0eb47869f86d36b3e5fad0d5073973f0444f3efe23fd14469a9e05154ea219228443098b1c5e4a8a0c5c78b4bfa7623735b50ebd6b8b4d0626766061850d6a62
+DIST ccache-4.0.tar.xz 383264 BLAKE2B ef4ca19860e2a0d313354cbd59a9eff441e86663820e8233dcf4b45a008ffa330b4a4c22eb11f3c6a7a98950d7d247034e60eb71c84ec4471f60fa19591651bd SHA512 1e55767bc2919109ae3c9b74f0adcd518e7e11df45c3981b2e9f8b04a780f9730457eeef1df137c65ab20e0959600c5317f06b58ffb82f5806c7c9f6cc305715
diff --git a/dev-util/ccache/ccache-4.0.ebuild b/dev-util/ccache/ccache-4.0.ebuild
new file mode 100644
index 00000000000..66c0f19279a
--- /dev/null
+++ b/dev-util/ccache/ccache-4.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+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}
+ 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 )"
+
+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.0-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_install() {
+ # TODO: install manpage: https://github.com/ccache/ccache/issues/684
+ 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.0-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.0-avoid-run-user.patch
new file mode 100644
index 00000000000..07da25c6c34
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.0-avoid-run-user.patch
@@ -0,0 +1,18 @@
+Gentoo's sandbox does not whitelist this path by default yet.
+TODO: bug link.
+
+Until we have a sandbox whitelisting the path let's rely on ccache's default.
+--- a/src/Config.cpp
++++ b/src/Config.cpp
+@@ -833,11 +833,5 @@ Config::check_key_tables_consistency()
+ std::string
+ Config::default_temporary_dir(const std::string& cache_dir)
+ {
+-#ifdef HAVE_GETEUID
+- std::string user_tmp_dir = fmt::format("/run/user/{}", geteuid());
+- if (Stat::stat(user_tmp_dir).is_directory()) {
+- return user_tmp_dir + "/ccache-tmp";
+- }
+-#endif
+ return cache_dir + "/tmp";
+ }
diff --git a/dev-util/ccache/files/ccache-4.0-objdump.patch b/dev-util/ccache/files/ccache-4.0-objdump.patch
new file mode 100644
index 00000000000..af48e997f50
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.0-objdump.patch
@@ -0,0 +1,12 @@
+Allow ${CHOST}-objdump (or any other override)
+--- a/test/run
++++ b/test/run
+@@ -133,7 +133,7 @@ objdump_cmd() {
+ # back to brute force and ignorance.
+ strings "$1"
+ else
+- objdump -W "$file"
++ ${OBJDUMP-objdump} -W "$file"
+ fi
+ }
+
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/
@ 2020-11-18 19:07 Sergei Trofimovich
0 siblings, 0 replies; 19+ messages in thread
From: Sergei Trofimovich @ 2020-11-18 19:07 UTC (permalink / raw
To: gentoo-commits
commit: 8cad6ded95c9f172ad2913e10d146b6afc3b69bb
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:07:21 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 19:07:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cad6ded
dev-util/ccache: link in missing libatomic
Fixes build failure on powerpc.
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-util/ccache/ccache-4.0.ebuild | 40 ++++++++++++++++++++++++++-
dev-util/ccache/files/ccache-4.0-atomic.patch | 21 ++++++++++++++
2 files changed, 60 insertions(+), 1 deletion(-)
diff --git a/dev-util/ccache/ccache-4.0.ebuild b/dev-util/ccache/ccache-4.0.ebuild
index 66c0f19279a..da46cf9b15a 100644
--- a/dev-util/ccache/ccache-4.0.ebuild
+++ b/dev-util/ccache/ccache-4.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit cmake
+inherit cmake toolchain-funcs
DESCRIPTION="fast compiler cache"
HOMEPAGE="https://ccache.dev/"
@@ -31,8 +31,39 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
"${FILESDIR}"/${PN}-4.0-objdump.patch
"${FILESDIR}"/${PN}-4.0-avoid-run-user.patch
+ "${FILESDIR}"/${PN}-4.0-atomic.patch
)
+# ccache does not do it automatically. TODO: fix upstream
+need_latomic() {
+ # test if -latomic is needed and helps. -latomic is needed
+ # at least on ppc32. Use bit of inodeCache.cpp test.
+ cat >"${T}"/a-test.cc <<-EOF
+ #include <atomic>
+ #include <cstdint>
+ std::atomic<std::int64_t> a;
+ int main() { return a.load() == 0; }
+ EOF
+
+ local cxx_cmd=(
+ $(tc-getCXX)
+ $CXXFLAGS
+ $LDFLAGS
+ "${T}"/a-test.cc
+ -o "${T}"/a-test
+ )
+
+ einfo "${cxx_cmd[@]}"
+ "${cxx_cmd[@]}" && return 1
+
+ einfo "Trying to add -latomic"
+ einfo "${cxx_cmd[@]}"
+ cxx_cmd+=(-latomic)
+ "${cxx_cmd[@]}" && return 0
+
+ return 1
+}
+
src_prepare() {
cmake_src_prepare
@@ -44,6 +75,13 @@ src_prepare() {
tc-export CC OBJDUMP
}
+src_configure() {
+ local mycmakeargs=(
+ -DLINK_WITH_ATOMIC=$(need_latomic && echo YES || echo NO)
+ )
+ cmake_src_configure
+}
+
src_install() {
# TODO: install manpage: https://github.com/ccache/ccache/issues/684
cmake_src_install
diff --git a/dev-util/ccache/files/ccache-4.0-atomic.patch b/dev-util/ccache/files/ccache-4.0-atomic.patch
new file mode 100644
index 00000000000..87b237c7dd5
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.0-atomic.patch
@@ -0,0 +1,21 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -63,11 +63,17 @@ if(WIN32)
+ endif()
+ endif()
+
++option(LINK_WITH_ATOMIC "Add 'atomic' if needed" OFF)
++set(atomic_lib "")
++if(LINK_WITH_ATOMIC)
++ set(atomic_lib "atomic")
++endif()
++
+ find_package(Threads REQUIRED)
+ target_link_libraries(
+ ccache_lib
+ PRIVATE standard_settings standard_warnings ZSTD::ZSTD
+- Threads::Threads third_party_lib)
++ Threads::Threads third_party_lib ${atomic_lib})
+
+ target_include_directories(ccache_lib PRIVATE ${CMAKE_BINARY_DIR} .)
+
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/
@ 2021-06-18 10:15 Sergei Trofimovich
0 siblings, 0 replies; 19+ messages in thread
From: Sergei Trofimovich @ 2021-06-18 10:15 UTC (permalink / raw
To: gentoo-commits
commit: 8e1ed9330e1ac2cbf65e01bad5b97910daf0397d
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 18 10:12:52 2021 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jun 18 10:15:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e1ed933
dev-util/ccache: backport PWD=. handling
Reported-by: 12101111
Closes: https://bugs.gentoo.org/751355
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-util/ccache/ccache-4.3-r2.ebuild | 90 ++++++++++++++++++++++++++++++
dev-util/ccache/files/ccache-4.3-PWD.patch | 85 ++++++++++++++++++++++++++++
2 files changed, 175 insertions(+)
diff --git a/dev-util/ccache/ccache-4.3-r2.ebuild b/dev-util/ccache/ccache-4.3-r2.ebuild
new file mode 100644
index 00000000000..987b811477e
--- /dev/null
+++ b/dev-util/ccache/ccache-4.3-r2.ebuild
@@ -0,0 +1,90 @@
+# 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="static-c++ 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}"/${P}-PWD.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
+
+ # Avoid dependency on libstdc++.so. Useful for cases when
+ # we would like to use ccache to build older gcc which injects
+ # into ccache locally built (possibly outdated) libstdc++
+ # See bug #761220 for examples.
+ #
+ # Ideally gcc should not use LD_PRELOAD to avoid this type of failures.
+ use static-c++ && append-ldflags -static-libstdc++
+}
+
+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.3-PWD.patch b/dev-util/ccache/files/ccache-4.3-PWD.patch
new file mode 100644
index 00000000000..3943dab5bd2
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.3-PWD.patch
@@ -0,0 +1,85 @@
+https://github.com/ccache/ccache/commit/2d720aed1843b47aafb2af8bfd15139228545e2b.patch
+https://bugs.gentoo.org/751355
+
+From 2d720aed1843b47aafb2af8bfd15139228545e2b Mon Sep 17 00:00:00 2001
+From: Joel Rosdahl <joel@rosdahl.net>
+Date: Wed, 16 Jun 2021 18:19:04 +0200
+Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20crash=20on=20relative=20PWD=20v?=
+ =?UTF-8?q?alue?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Even though PWD “shall represent an absolute pathname of the current
+working directory”[1], we shouldn’t crash if a user sets it to a
+relative path.
+
+[1]: https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_03
+
+Fixes #860.
+---
+ src/Util.cpp | 2 +-
+ test/run | 1 +
+ test/suites/basedir.bash | 32 ++++++++++++++++++++++++++++++++
+ 3 files changed, 34 insertions(+), 1 deletion(-)
+
+--- a/src/Util.cpp
++++ b/src/Util.cpp
+@@ -617,7 +617,7 @@ get_apparent_cwd(const std::string& actual_cwd)
+ return actual_cwd;
+ #else
+ auto pwd = getenv("PWD");
+- if (!pwd) {
++ if (!pwd || !Util::is_absolute_path(pwd)) {
+ return actual_cwd;
+ }
+
+--- a/test/run
++++ b/test/run
+@@ -356,6 +356,7 @@ reset_environment() {
+ unset TERM
+ unset XDG_CACHE_HOME
+ unset XDG_CONFIG_HOME
++ export PWD=$(pwd)
+
+ export CCACHE_DETECT_SHEBANG=1
+ export CCACHE_DIR=$ABS_TESTDIR/.ccache
+--- a/test/suites/basedir.bash
++++ b/test/suites/basedir.bash
+@@ -311,4 +311,36 @@ EOF
+ expect_stat 'cache miss' 1
+ expect_equal_content reference.stderr ccache.stderr
+ fi
++
++ # -------------------------------------------------------------------------
++ TEST "Relative PWD"
++
++ cd dir1
++ CCACHE_BASEDIR="$(pwd)" PWD=. $CCACHE_COMPILE -I$(pwd)/include -c src/test.c
++ expect_stat 'cache hit (direct)' 0
++ expect_stat 'cache hit (preprocessed)' 0
++ expect_stat 'cache miss' 1
++
++ cd ../dir2
++ CCACHE_BASEDIR="$(pwd)" PWD=. $CCACHE_COMPILE -I$(pwd)/include -c src/test.c
++ expect_stat 'cache hit (direct)' 1
++ expect_stat 'cache hit (preprocessed)' 0
++ expect_stat 'cache miss' 1
++
++ # -------------------------------------------------------------------------
++ TEST "Unset PWD"
++
++ unset PWD
++
++ cd dir1
++ CCACHE_BASEDIR="$(pwd)" $CCACHE_COMPILE -I$(pwd)/include -c src/test.c
++ expect_stat 'cache hit (direct)' 0
++ expect_stat 'cache hit (preprocessed)' 0
++ expect_stat 'cache miss' 1
++
++ cd ../dir2
++ CCACHE_BASEDIR="$(pwd)" $CCACHE_COMPILE -I$(pwd)/include -c src/test.c
++ expect_stat 'cache hit (direct)' 1
++ expect_stat 'cache hit (preprocessed)' 0
++ expect_stat 'cache miss' 1
+ }
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/
@ 2022-04-09 4:30 Sam James
0 siblings, 0 replies; 19+ messages in thread
From: Sam James @ 2022-04-09 4:30 UTC (permalink / raw
To: gentoo-commits
commit: 1ed449cc0f55f53a177ce4cc6c81463a0e04d633
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 9 04:28:33 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 9 04:30:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ed449cc
dev-util/ccache: add 4.6
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/ccache/Manifest | 2 +
dev-util/ccache/ccache-4.6.ebuild | 92 ++++++++++++++++++++++
.../ccache/files/ccache-4.1-avoid-run-user.patch | 6 ++
3 files changed, 100 insertions(+)
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 8001b81d957a..29ab5c3c1a3d 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,3 +1,5 @@
DIST ccache-4.3.tar.xz 433508 BLAKE2B 6ab48aa587b4dc86020e3b0f722003dc5c03709626e143a1d38506b6072f9963fc76e89b6d18128dfc28035bf8d24e46ea44f219db69a1b3a294416f0b023090 SHA512 ec082de95ea8b22154ce1e67e0a0fc28266cfb71f382205f7eab14e6ac1c7841027d063041131832b3227d833d99ec874e90df238f35f433de4c381566931c7f
DIST ccache-4.4.2.tar.xz 510260 BLAKE2B f0d8b9ac6e1972592ce5a51a392279a01f01c09e6bffc498ff0b20aa46acb6d7f949ae9f4c6006e20b15cdea9fa2fa057c78b69ef66c2e13b3ddee13367e91b1 SHA512 afcec4806b1e307ec16006ecd9e39eb69fc1376407877f024c882926725d41f2b08eccdcfb3efd8dac9e481d07f9c08c043b8cea5ea563a0f49b2f587325e4a7
DIST ccache-4.5.1.tar.xz 513008 BLAKE2B 637b6d36c169bc742efd165569879a47405c2884918ed3731186e8176c926fa0e8e9cd648756d501ae3b741c671e2399cfdb0bc216410bc64826d4fe00d69498 SHA512 267dcc6b41270eeffe029d13e58eca3399540037cc19dc58bb5ebeb7dcc51b201fbde91c9824eaee5b14fbf28bb7304b78d1340118bc72e56b80ff148575bc56
+DIST ccache-4.6.tar.xz 526084 BLAKE2B 2e43d0a3a004117e8c535ecb2f09c1273f5bec2b3704710abbc3034749438df33ef27db37d5bfbd48d83d60bdd3f738d3dbf356eff21166fee03780969dd1f24 SHA512 3a53fedfa91034ee876e1a4a672de25498fe53c6c80901bd4976049eb35e0479275ceb6627f0e8cf76d677d041d216f731daf4bad142e454e775b5e7f05e3e4e
+DIST ccache-4.6.tar.xz.asc 833 BLAKE2B e0fc7677087006e3c6ac2bb7285915a56f233b4058c738c9d5967d29baf62b1b072ad2da4bf12f076440c68f39be77333d001d68703c32e26bd88a42b9e3ce71 SHA512 af09ffcdbba5e1e26047c7692dd0cf61f07869720d5849f59cbc0fe0f61c11aa419226d4d05061d23b5a03e8ec995e4d0e5af398af096bd19dbe35bf460eee0c
diff --git a/dev-util/ccache/ccache-4.6.ebuild b/dev-util/ccache/ccache-4.6.ebuild
new file mode 100644
index 000000000000..9bff72bc83a7
--- /dev/null
+++ b/dev-util/ccache/ccache-4.6.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="doc redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="app-arch/zstd:=
+ redis? ( dev-libs/hiredis:= )"
+RDEPEND="${DEPEND}
+ dev-util/shadowman
+ sys-apps/gentoo-functions"
+# Needed for eselect calls in pkg_*
+IDEPEND="dev-util/shadowman"
+
+# 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=" doc? ( dev-ruby/asciidoctor )
+ verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )"
+
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+ "${FILESDIR}"/${PN}-4.0-objdump.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ sed \
+ -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+ "${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_configure() {
+ # Mainly used in tests
+ tc-export CC OBJDUMP
+
+ # Avoid dependency on libstdc++.so. Useful for cases when
+ # we would like to use ccache to build older gcc which injects
+ # into ccache locally built (possibly outdated) libstdc++
+ # See bug #761220 for examples.
+ #
+ # Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
+ use static-c++ && append-ldflags -static-libstdc++
+
+ local mycmakeargs=(
+ -DENABLE_DOCUMENTATION=$(usex doc)
+ -DENABLE_TESTING=$(usex test)
+ -DZSTD_FROM_INTERNET=OFF
+ -DREDIS_STORAGE_BACKEND=$(usex redis)
+ )
+
+ use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=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} && -z ${ROOT} ]] ; then
+ eselect compiler-shadow remove ccache
+ fi
+}
+
+pkg_postinst() {
+ if [[ -z ${ROOT} ]] ; then
+ eselect compiler-shadow update ccache
+ fi
+}
diff --git a/dev-util/ccache/files/ccache-4.1-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.1-avoid-run-user.patch
index be7db76ecbf0..b1d0837ef3e0 100644
--- a/dev-util/ccache/files/ccache-4.1-avoid-run-user.patch
+++ b/dev-util/ccache/files/ccache-4.1-avoid-run-user.patch
@@ -1,6 +1,12 @@
Gentoo's sandbox does not whitelist this path by default yet.
TODO: bug link.
+(4.1 update:
+https://github.com/ccache/ccache/issues/984
+https://github.com/ccache/ccache/issues/1044
+https://github.com/ccache/ccache/commit/a0edd4294f6a5a2d3f0c7b01273736f975f250e1
+https://github.com/ccache/ccache/commit/ef2e922f9642f943199138447b29ec53fa63ea68)
+
Until we have a sandbox whitelisting the path let's rely on ccache's default.
--- a/src/Config.cpp
+++ b/src/Config.cpp
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/
@ 2022-04-09 11:26 Sam James
0 siblings, 0 replies; 19+ messages in thread
From: Sam James @ 2022-04-09 11:26 UTC (permalink / raw
To: gentoo-commits
commit: 9767f9723c5c168a772653541283cb9065090c1e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 9 11:26:14 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 9 11:26:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9767f972
dev-util/ccache: restore /run-skip patch
I still can't hit this but let's rebase the old patch
given it makes sense for now.
Closes: https://bugs.gentoo.org/837362
Bug: https://bugs.gentoo.org/837380
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/ccache/ccache-4.6.ebuild | 1 +
.../ccache/files/ccache-4.6-avoid-run-user.patch | 28 ++++++++++++++++++++++
2 files changed, 29 insertions(+)
diff --git a/dev-util/ccache/ccache-4.6.ebuild b/dev-util/ccache/ccache-4.6.ebuild
index 9bff72bc83a7..d3c7ceee833f 100644
--- a/dev-util/ccache/ccache-4.6.ebuild
+++ b/dev-util/ccache/ccache-4.6.ebuild
@@ -37,6 +37,7 @@ 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.6-avoid-run-user.patch
)
src_prepare() {
diff --git a/dev-util/ccache/files/ccache-4.6-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.6-avoid-run-user.patch
new file mode 100644
index 000000000000..cfdd09f79e66
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.6-avoid-run-user.patch
@@ -0,0 +1,28 @@
+Gentoo's sandbox does not whitelist this path by default yet.
+
+(4.1 update:
+https://github.com/ccache/ccache/issues/984
+https://github.com/ccache/ccache/issues/1044
+https://github.com/ccache/ccache/commit/a0edd4294f6a5a2d3f0c7b01273736f975f250e1
+https://github.com/ccache/ccache/commit/ef2e922f9642f943199138447b29ec53fa63ea68
+... gets us closer, but not there yet.)
+
+https://bugs.gentoo.org/837362 for 4.6 issue.
+--- a/src/Config.cpp
++++ b/src/Config.cpp
+@@ -1031,14 +1031,5 @@ Config::check_key_tables_consistency()
+ std::string
+ Config::default_temporary_dir(const std::string& cache_dir)
+ {
+- static const std::string run_user_tmp_dir = [] {
+-#ifdef HAVE_GETEUID
+- auto dir = FMT("/run/user/{}/ccache-tmp", geteuid());
+- if (Util::create_dir(dir)) {
+- return dir;
+- }
+-#endif
+- return std::string();
+- }();
+- return !run_user_tmp_dir.empty() ? run_user_tmp_dir : cache_dir + "/tmp";
++ return cache_dir + "/tmp";
+ }
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/
@ 2022-05-20 19:26 Matt Turner
0 siblings, 0 replies; 19+ messages in thread
From: Matt Turner @ 2022-05-20 19:26 UTC (permalink / raw
To: gentoo-commits
commit: fe611282019feabd47b3bf0cca5e7630225666bb
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri May 20 18:59:57 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri May 20 19:25:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe611282
dev-util/ccache: Version bump to 4.6.1
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
dev-util/ccache/Manifest | 2 +
dev-util/ccache/ccache-4.6.1.ebuild | 93 ++++++++++++++++++++++
.../ccache/files/ccache-4.6.1-avoid-run-user.patch | 28 +++++++
3 files changed, 123 insertions(+)
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index ddf19bb26242..7a1b44c369a5 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,3 +1,5 @@
DIST ccache-4.5.1.tar.xz 513008 BLAKE2B 637b6d36c169bc742efd165569879a47405c2884918ed3731186e8176c926fa0e8e9cd648756d501ae3b741c671e2399cfdb0bc216410bc64826d4fe00d69498 SHA512 267dcc6b41270eeffe029d13e58eca3399540037cc19dc58bb5ebeb7dcc51b201fbde91c9824eaee5b14fbf28bb7304b78d1340118bc72e56b80ff148575bc56
+DIST ccache-4.6.1.tar.xz 529040 BLAKE2B b4c1cae8b0c836c9e562488c79524ddbba4c995946e16f87c9b856e32961b454dd205bacdb030c283477be66d357b0fb5e67c9ad38715359b73f714aa73baee9 SHA512 361427ccecd74e8c25ca6a98ef3d3c125d81862196767eb383f6f8159fed8e1695cd5bc8731cb591c23c55352f0114a088b32a673717711efbfbb178a6c08c82
+DIST ccache-4.6.1.tar.xz.asc 833 BLAKE2B 2f9ca555a014cfc9dbc354f43d4db0d79f89a6f84c57a7b9452324854abb39cd21af1071404278c694212f38c3975c7fa702f7cc475e44f75e9b132e53088d5d SHA512 5494844f99232c5bc21f52db461f2a03d706e38bd73e147ebda89a4ce57fc2b80a920e42f7de539b9a5837ac8b515b309a29e045e479910c95a95d3c839b837d
DIST ccache-4.6.tar.xz 526084 BLAKE2B 2e43d0a3a004117e8c535ecb2f09c1273f5bec2b3704710abbc3034749438df33ef27db37d5bfbd48d83d60bdd3f738d3dbf356eff21166fee03780969dd1f24 SHA512 3a53fedfa91034ee876e1a4a672de25498fe53c6c80901bd4976049eb35e0479275ceb6627f0e8cf76d677d041d216f731daf4bad142e454e775b5e7f05e3e4e
DIST ccache-4.6.tar.xz.asc 833 BLAKE2B e0fc7677087006e3c6ac2bb7285915a56f233b4058c738c9d5967d29baf62b1b072ad2da4bf12f076440c68f39be77333d001d68703c32e26bd88a42b9e3ce71 SHA512 af09ffcdbba5e1e26047c7692dd0cf61f07869720d5849f59cbc0fe0f61c11aa419226d4d05061d23b5a03e8ec995e4d0e5af398af096bd19dbe35bf460eee0c
diff --git a/dev-util/ccache/ccache-4.6.1.ebuild b/dev-util/ccache/ccache-4.6.1.ebuild
new file mode 100644
index 000000000000..95ae40faf2de
--- /dev/null
+++ b/dev-util/ccache/ccache-4.6.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="doc redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="app-arch/zstd:=
+ redis? ( dev-libs/hiredis:= )"
+RDEPEND="${DEPEND}
+ dev-util/shadowman
+ sys-apps/gentoo-functions"
+# Needed for eselect calls in pkg_*
+IDEPEND="dev-util/shadowman"
+
+# 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=" doc? ( dev-ruby/asciidoctor )
+ verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )"
+
+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.6.1-avoid-run-user.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ sed \
+ -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+ "${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_configure() {
+ # Mainly used in tests
+ tc-export CC OBJDUMP
+
+ # Avoid dependency on libstdc++.so. Useful for cases when
+ # we would like to use ccache to build older gcc which injects
+ # into ccache locally built (possibly outdated) libstdc++
+ # See bug #761220 for examples.
+ #
+ # Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
+ use static-c++ && append-ldflags -static-libstdc++
+
+ local mycmakeargs=(
+ -DENABLE_DOCUMENTATION=$(usex doc)
+ -DENABLE_TESTING=$(usex test)
+ -DZSTD_FROM_INTERNET=OFF
+ -DREDIS_STORAGE_BACKEND=$(usex redis)
+ )
+
+ use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=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} && -z ${ROOT} ]] ; then
+ eselect compiler-shadow remove ccache
+ fi
+}
+
+pkg_postinst() {
+ if [[ -z ${ROOT} ]] ; then
+ eselect compiler-shadow update ccache
+ fi
+}
diff --git a/dev-util/ccache/files/ccache-4.6.1-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.6.1-avoid-run-user.patch
new file mode 100644
index 000000000000..9dce69c63518
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.6.1-avoid-run-user.patch
@@ -0,0 +1,28 @@
+Gentoo's sandbox does not whitelist this path by default yet.
+
+(4.1 update:
+https://github.com/ccache/ccache/issues/984
+https://github.com/ccache/ccache/issues/1044
+https://github.com/ccache/ccache/commit/a0edd4294f6a5a2d3f0c7b01273736f975f250e1
+https://github.com/ccache/ccache/commit/ef2e922f9642f943199138447b29ec53fa63ea68
+... gets us closer, but not there yet.)
+
+https://bugs.gentoo.org/837362 for 4.6 issue.
+--- a/src/Config.cpp
++++ b/src/Config.cpp
+@@ -1039,14 +1039,5 @@ Config::check_key_tables_consistency()
+ std::string
+ Config::default_temporary_dir(const std::string& cache_dir)
+ {
+- static const std::string run_user_tmp_dir = [] {
+-#ifdef HAVE_GETEUID
+- auto dir = FMT("/run/user/{}/ccache-tmp", geteuid());
+- if (Util::create_dir(dir) && access(dir.c_str(), W_OK) == 0) {
+- return dir;
+- }
+-#endif
+- return std::string();
+- }();
+- return !run_user_tmp_dir.empty() ? run_user_tmp_dir : cache_dir + "/tmp";
++ return cache_dir + "/tmp";
+ }
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/
@ 2022-08-22 21:08 Sam James
0 siblings, 0 replies; 19+ messages in thread
From: Sam James @ 2022-08-22 21:08 UTC (permalink / raw
To: gentoo-commits
commit: ae6b3941bae945937367927bf2a651b220845071
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 22 20:04:22 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 22 21:08:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae6b3941
dev-util/ccache: add 4.6.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/ccache/Manifest | 2 +
dev-util/ccache/ccache-4.6.2.ebuild | 93 ++++++++++++++++++++++
.../ccache/files/ccache-4.6.2-avoid-run-user.patch | 30 +++++++
3 files changed, 125 insertions(+)
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 7a1b44c369a5..7fa32ed168dc 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,5 +1,7 @@
DIST ccache-4.5.1.tar.xz 513008 BLAKE2B 637b6d36c169bc742efd165569879a47405c2884918ed3731186e8176c926fa0e8e9cd648756d501ae3b741c671e2399cfdb0bc216410bc64826d4fe00d69498 SHA512 267dcc6b41270eeffe029d13e58eca3399540037cc19dc58bb5ebeb7dcc51b201fbde91c9824eaee5b14fbf28bb7304b78d1340118bc72e56b80ff148575bc56
DIST ccache-4.6.1.tar.xz 529040 BLAKE2B b4c1cae8b0c836c9e562488c79524ddbba4c995946e16f87c9b856e32961b454dd205bacdb030c283477be66d357b0fb5e67c9ad38715359b73f714aa73baee9 SHA512 361427ccecd74e8c25ca6a98ef3d3c125d81862196767eb383f6f8159fed8e1695cd5bc8731cb591c23c55352f0114a088b32a673717711efbfbb178a6c08c82
DIST ccache-4.6.1.tar.xz.asc 833 BLAKE2B 2f9ca555a014cfc9dbc354f43d4db0d79f89a6f84c57a7b9452324854abb39cd21af1071404278c694212f38c3975c7fa702f7cc475e44f75e9b132e53088d5d SHA512 5494844f99232c5bc21f52db461f2a03d706e38bd73e147ebda89a4ce57fc2b80a920e42f7de539b9a5837ac8b515b309a29e045e479910c95a95d3c839b837d
+DIST ccache-4.6.2.tar.xz 530952 BLAKE2B ef0fec6438ea69b109e918decb5e4a768ae0a5350e124b18cf700af7d307ed7a46509d02a9499aee87ed76a8fe5b9e4523ffec1fcc37b9b0a5ad56e5e713f8b8 SHA512 324c09c7cc76425552fd88e7483527c20ae977c817de1f0dff8a0102ae98f1c35d5e08c8a49c83ad76f6564ea912d9a500948051baa028139074913a6e07e452
+DIST ccache-4.6.2.tar.xz.asc 833 BLAKE2B dc4103d15808f044e47e27967df0b3ac063e40c4a40175958c99cf2609549657f4eec761f7d1103d8995ed7a86ad844cadd411fc4a4928901d78191f2dbe291b SHA512 66f42af7fb43ce1e701adaf911829d6690388e69249e6d97e0f51c31510f4198c22a7fdf68489f7b59fa07d311b2391be02d0a6702e8d890401318e4bfafd900
DIST ccache-4.6.tar.xz 526084 BLAKE2B 2e43d0a3a004117e8c535ecb2f09c1273f5bec2b3704710abbc3034749438df33ef27db37d5bfbd48d83d60bdd3f738d3dbf356eff21166fee03780969dd1f24 SHA512 3a53fedfa91034ee876e1a4a672de25498fe53c6c80901bd4976049eb35e0479275ceb6627f0e8cf76d677d041d216f731daf4bad142e454e775b5e7f05e3e4e
DIST ccache-4.6.tar.xz.asc 833 BLAKE2B e0fc7677087006e3c6ac2bb7285915a56f233b4058c738c9d5967d29baf62b1b072ad2da4bf12f076440c68f39be77333d001d68703c32e26bd88a42b9e3ce71 SHA512 af09ffcdbba5e1e26047c7692dd0cf61f07869720d5849f59cbc0fe0f61c11aa419226d4d05061d23b5a03e8ec995e4d0e5af398af096bd19dbe35bf460eee0c
diff --git a/dev-util/ccache/ccache-4.6.2.ebuild b/dev-util/ccache/ccache-4.6.2.ebuild
new file mode 100644
index 000000000000..e6fd6165c15d
--- /dev/null
+++ b/dev-util/ccache/ccache-4.6.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="doc redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="app-arch/zstd:=
+ redis? ( dev-libs/hiredis:= )"
+RDEPEND="${DEPEND}
+ dev-util/shadowman
+ sys-apps/gentoo-functions"
+# Needed for eselect calls in pkg_*
+IDEPEND="dev-util/shadowman"
+
+# 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=" doc? ( dev-ruby/asciidoctor )
+ verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )"
+
+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.6.2-avoid-run-user.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ sed \
+ -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+ "${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_configure() {
+ # Mainly used in tests
+ tc-export CC OBJDUMP
+
+ # Avoid dependency on libstdc++.so. Useful for cases when
+ # we would like to use ccache to build older gcc which injects
+ # into ccache locally built (possibly outdated) libstdc++
+ # See bug #761220 for examples.
+ #
+ # Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
+ use static-c++ && append-ldflags -static-libstdc++
+
+ local mycmakeargs=(
+ -DENABLE_DOCUMENTATION=$(usex doc)
+ -DENABLE_TESTING=$(usex test)
+ -DZSTD_FROM_INTERNET=OFF
+ -DREDIS_STORAGE_BACKEND=$(usex redis)
+ )
+
+ use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=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} && -z ${ROOT} ]] ; then
+ eselect compiler-shadow remove ccache
+ fi
+}
+
+pkg_postinst() {
+ if [[ -z ${ROOT} ]] ; then
+ eselect compiler-shadow update ccache
+ fi
+}
diff --git a/dev-util/ccache/files/ccache-4.6.2-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.6.2-avoid-run-user.patch
new file mode 100644
index 000000000000..ff579ca7fdb6
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.6.2-avoid-run-user.patch
@@ -0,0 +1,30 @@
+Gentoo's sandbox does not whitelist this path by default yet.
+
+(4.1 update:
+https://github.com/ccache/ccache/issues/984
+https://github.com/ccache/ccache/issues/1044
+https://github.com/ccache/ccache/commit/a0edd4294f6a5a2d3f0c7b01273736f975f250e1
+https://github.com/ccache/ccache/commit/ef2e922f9642f943199138447b29ec53fa63ea68
+... gets us closer, but not there yet.)
+
+And see https://github.com/ccache/ccache/discussions/1086#discussioncomment-3327565.
+
+https://bugs.gentoo.org/837362 for 4.6 issue.
+--- a/src/Config.cpp
++++ b/src/Config.cpp
+@@ -1039,14 +1039,5 @@ Config::check_key_tables_consistency()
+ std::string
+ Config::default_temporary_dir() const
+ {
+- static const std::string run_user_tmp_dir = [] {
+-#ifdef HAVE_GETEUID
+- auto dir = FMT("/run/user/{}/ccache-tmp", geteuid());
+- if (Util::create_dir(dir) && access(dir.c_str(), W_OK) == 0) {
+- return dir;
+- }
+-#endif
+- return std::string();
+- }();
+- return !run_user_tmp_dir.empty() ? run_user_tmp_dir : m_cache_dir + "/tmp";
++ return m_cache_dir + "/tmp";
+ }
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/
@ 2022-09-23 1:56 Sam James
0 siblings, 0 replies; 19+ messages in thread
From: Sam James @ 2022-09-23 1:56 UTC (permalink / raw
To: gentoo-commits
commit: 93ff4df64ce3ad1585f52faca10a4bcafc86703f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 01:55:26 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 01:55:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93ff4df6
dev-util/ccache: drop 4.6-r1, 4.6.1, 4.6.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/ccache/Manifest | 6 --
dev-util/ccache/ccache-4.6-r1.ebuild | 93 ----------------------
dev-util/ccache/ccache-4.6.1.ebuild | 93 ----------------------
dev-util/ccache/ccache-4.6.2.ebuild | 93 ----------------------
.../ccache/files/ccache-4.6-avoid-run-user.patch | 28 -------
.../ccache/files/ccache-4.6.1-avoid-run-user.patch | 28 -------
6 files changed, 341 deletions(-)
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 92a864aa4108..b00c2ab50f9a 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,9 +1,3 @@
DIST ccache-4.5.1.tar.xz 513008 BLAKE2B 637b6d36c169bc742efd165569879a47405c2884918ed3731186e8176c926fa0e8e9cd648756d501ae3b741c671e2399cfdb0bc216410bc64826d4fe00d69498 SHA512 267dcc6b41270eeffe029d13e58eca3399540037cc19dc58bb5ebeb7dcc51b201fbde91c9824eaee5b14fbf28bb7304b78d1340118bc72e56b80ff148575bc56
-DIST ccache-4.6.1.tar.xz 529040 BLAKE2B b4c1cae8b0c836c9e562488c79524ddbba4c995946e16f87c9b856e32961b454dd205bacdb030c283477be66d357b0fb5e67c9ad38715359b73f714aa73baee9 SHA512 361427ccecd74e8c25ca6a98ef3d3c125d81862196767eb383f6f8159fed8e1695cd5bc8731cb591c23c55352f0114a088b32a673717711efbfbb178a6c08c82
-DIST ccache-4.6.1.tar.xz.asc 833 BLAKE2B 2f9ca555a014cfc9dbc354f43d4db0d79f89a6f84c57a7b9452324854abb39cd21af1071404278c694212f38c3975c7fa702f7cc475e44f75e9b132e53088d5d SHA512 5494844f99232c5bc21f52db461f2a03d706e38bd73e147ebda89a4ce57fc2b80a920e42f7de539b9a5837ac8b515b309a29e045e479910c95a95d3c839b837d
-DIST ccache-4.6.2.tar.xz 530952 BLAKE2B ef0fec6438ea69b109e918decb5e4a768ae0a5350e124b18cf700af7d307ed7a46509d02a9499aee87ed76a8fe5b9e4523ffec1fcc37b9b0a5ad56e5e713f8b8 SHA512 324c09c7cc76425552fd88e7483527c20ae977c817de1f0dff8a0102ae98f1c35d5e08c8a49c83ad76f6564ea912d9a500948051baa028139074913a6e07e452
-DIST ccache-4.6.2.tar.xz.asc 833 BLAKE2B dc4103d15808f044e47e27967df0b3ac063e40c4a40175958c99cf2609549657f4eec761f7d1103d8995ed7a86ad844cadd411fc4a4928901d78191f2dbe291b SHA512 66f42af7fb43ce1e701adaf911829d6690388e69249e6d97e0f51c31510f4198c22a7fdf68489f7b59fa07d311b2391be02d0a6702e8d890401318e4bfafd900
DIST ccache-4.6.3.tar.xz 531184 BLAKE2B b23c22876cd3f31bcd67b9120fd5e605441508478f40267d654a281c00e28e3021b135cda04ace6da9fb39d3c144c92a259e69287be73043730240f32982b6a9 SHA512 b8cee0a466e76d5551c9785836c66ac5a98b51624e9f919adf820265ec19c3429c99ed332aecdafcd03cf32c71074121c63ec56762259921c3762a011be24966
DIST ccache-4.6.3.tar.xz.asc 833 BLAKE2B 064d7bdf474540992180372c4c011b5bdeb98834803abcdec474f0988cac0339281c388545f9d28ae22b740268c338e092d618c0a4664c62c307d9a9ec1dff5e SHA512 ecba59c8089848737f37ef9bae4f631fae7eb2fedfc62879cd181ce37d412fbd883cc9dee52850757258009d75ef06477441cbf17d39db7b9d955300737e7f89
-DIST ccache-4.6.tar.xz 526084 BLAKE2B 2e43d0a3a004117e8c535ecb2f09c1273f5bec2b3704710abbc3034749438df33ef27db37d5bfbd48d83d60bdd3f738d3dbf356eff21166fee03780969dd1f24 SHA512 3a53fedfa91034ee876e1a4a672de25498fe53c6c80901bd4976049eb35e0479275ceb6627f0e8cf76d677d041d216f731daf4bad142e454e775b5e7f05e3e4e
-DIST ccache-4.6.tar.xz.asc 833 BLAKE2B e0fc7677087006e3c6ac2bb7285915a56f233b4058c738c9d5967d29baf62b1b072ad2da4bf12f076440c68f39be77333d001d68703c32e26bd88a42b9e3ce71 SHA512 af09ffcdbba5e1e26047c7692dd0cf61f07869720d5849f59cbc0fe0f61c11aa419226d4d05061d23b5a03e8ec995e4d0e5af398af096bd19dbe35bf460eee0c
diff --git a/dev-util/ccache/ccache-4.6-r1.ebuild b/dev-util/ccache/ccache-4.6-r1.ebuild
deleted file mode 100644
index 046476bcf614..000000000000
--- a/dev-util/ccache/ccache-4.6-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
-inherit cmake toolchain-funcs flag-o-matic verify-sig
-
-DESCRIPTION="Fast compiler cache"
-HOMEPAGE="https://ccache.dev/"
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
-IUSE="doc redis +static-c++ test"
-RESTRICT="!test? ( test )"
-
-DEPEND="app-arch/zstd:=
- redis? ( dev-libs/hiredis:= )"
-RDEPEND="${DEPEND}
- dev-util/shadowman
- sys-apps/gentoo-functions"
-# Needed for eselect calls in pkg_*
-IDEPEND="dev-util/shadowman"
-
-# 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=" doc? ( dev-ruby/asciidoctor )
- verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )"
-
-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.6-avoid-run-user.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- sed \
- -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
- "${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_configure() {
- # Mainly used in tests
- tc-export CC OBJDUMP
-
- # Avoid dependency on libstdc++.so. Useful for cases when
- # we would like to use ccache to build older gcc which injects
- # into ccache locally built (possibly outdated) libstdc++
- # See bug #761220 for examples.
- #
- # Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
- use static-c++ && append-ldflags -static-libstdc++
-
- local mycmakeargs=(
- -DENABLE_DOCUMENTATION=$(usex doc)
- -DENABLE_TESTING=$(usex test)
- -DZSTD_FROM_INTERNET=OFF
- -DREDIS_STORAGE_BACKEND=$(usex redis)
- )
-
- use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=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} && -z ${ROOT} ]] ; then
- eselect compiler-shadow remove ccache
- fi
-}
-
-pkg_postinst() {
- if [[ -z ${ROOT} ]] ; then
- eselect compiler-shadow update ccache
- fi
-}
diff --git a/dev-util/ccache/ccache-4.6.1.ebuild b/dev-util/ccache/ccache-4.6.1.ebuild
deleted file mode 100644
index 95ae40faf2de..000000000000
--- a/dev-util/ccache/ccache-4.6.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
-inherit cmake toolchain-funcs flag-o-matic verify-sig
-
-DESCRIPTION="Fast compiler cache"
-HOMEPAGE="https://ccache.dev/"
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
-IUSE="doc redis +static-c++ test"
-RESTRICT="!test? ( test )"
-
-DEPEND="app-arch/zstd:=
- redis? ( dev-libs/hiredis:= )"
-RDEPEND="${DEPEND}
- dev-util/shadowman
- sys-apps/gentoo-functions"
-# Needed for eselect calls in pkg_*
-IDEPEND="dev-util/shadowman"
-
-# 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=" doc? ( dev-ruby/asciidoctor )
- verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )"
-
-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.6.1-avoid-run-user.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- sed \
- -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
- "${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_configure() {
- # Mainly used in tests
- tc-export CC OBJDUMP
-
- # Avoid dependency on libstdc++.so. Useful for cases when
- # we would like to use ccache to build older gcc which injects
- # into ccache locally built (possibly outdated) libstdc++
- # See bug #761220 for examples.
- #
- # Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
- use static-c++ && append-ldflags -static-libstdc++
-
- local mycmakeargs=(
- -DENABLE_DOCUMENTATION=$(usex doc)
- -DENABLE_TESTING=$(usex test)
- -DZSTD_FROM_INTERNET=OFF
- -DREDIS_STORAGE_BACKEND=$(usex redis)
- )
-
- use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=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} && -z ${ROOT} ]] ; then
- eselect compiler-shadow remove ccache
- fi
-}
-
-pkg_postinst() {
- if [[ -z ${ROOT} ]] ; then
- eselect compiler-shadow update ccache
- fi
-}
diff --git a/dev-util/ccache/ccache-4.6.2.ebuild b/dev-util/ccache/ccache-4.6.2.ebuild
deleted file mode 100644
index e6fd6165c15d..000000000000
--- a/dev-util/ccache/ccache-4.6.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
-inherit cmake toolchain-funcs flag-o-matic verify-sig
-
-DESCRIPTION="Fast compiler cache"
-HOMEPAGE="https://ccache.dev/"
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
-IUSE="doc redis +static-c++ test"
-RESTRICT="!test? ( test )"
-
-DEPEND="app-arch/zstd:=
- redis? ( dev-libs/hiredis:= )"
-RDEPEND="${DEPEND}
- dev-util/shadowman
- sys-apps/gentoo-functions"
-# Needed for eselect calls in pkg_*
-IDEPEND="dev-util/shadowman"
-
-# 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=" doc? ( dev-ruby/asciidoctor )
- verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )"
-
-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.6.2-avoid-run-user.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- sed \
- -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
- "${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_configure() {
- # Mainly used in tests
- tc-export CC OBJDUMP
-
- # Avoid dependency on libstdc++.so. Useful for cases when
- # we would like to use ccache to build older gcc which injects
- # into ccache locally built (possibly outdated) libstdc++
- # See bug #761220 for examples.
- #
- # Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
- use static-c++ && append-ldflags -static-libstdc++
-
- local mycmakeargs=(
- -DENABLE_DOCUMENTATION=$(usex doc)
- -DENABLE_TESTING=$(usex test)
- -DZSTD_FROM_INTERNET=OFF
- -DREDIS_STORAGE_BACKEND=$(usex redis)
- )
-
- use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=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} && -z ${ROOT} ]] ; then
- eselect compiler-shadow remove ccache
- fi
-}
-
-pkg_postinst() {
- if [[ -z ${ROOT} ]] ; then
- eselect compiler-shadow update ccache
- fi
-}
diff --git a/dev-util/ccache/files/ccache-4.6-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.6-avoid-run-user.patch
deleted file mode 100644
index cfdd09f79e66..000000000000
--- a/dev-util/ccache/files/ccache-4.6-avoid-run-user.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Gentoo's sandbox does not whitelist this path by default yet.
-
-(4.1 update:
-https://github.com/ccache/ccache/issues/984
-https://github.com/ccache/ccache/issues/1044
-https://github.com/ccache/ccache/commit/a0edd4294f6a5a2d3f0c7b01273736f975f250e1
-https://github.com/ccache/ccache/commit/ef2e922f9642f943199138447b29ec53fa63ea68
-... gets us closer, but not there yet.)
-
-https://bugs.gentoo.org/837362 for 4.6 issue.
---- a/src/Config.cpp
-+++ b/src/Config.cpp
-@@ -1031,14 +1031,5 @@ Config::check_key_tables_consistency()
- std::string
- Config::default_temporary_dir(const std::string& cache_dir)
- {
-- static const std::string run_user_tmp_dir = [] {
--#ifdef HAVE_GETEUID
-- auto dir = FMT("/run/user/{}/ccache-tmp", geteuid());
-- if (Util::create_dir(dir)) {
-- return dir;
-- }
--#endif
-- return std::string();
-- }();
-- return !run_user_tmp_dir.empty() ? run_user_tmp_dir : cache_dir + "/tmp";
-+ return cache_dir + "/tmp";
- }
diff --git a/dev-util/ccache/files/ccache-4.6.1-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.6.1-avoid-run-user.patch
deleted file mode 100644
index 9dce69c63518..000000000000
--- a/dev-util/ccache/files/ccache-4.6.1-avoid-run-user.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Gentoo's sandbox does not whitelist this path by default yet.
-
-(4.1 update:
-https://github.com/ccache/ccache/issues/984
-https://github.com/ccache/ccache/issues/1044
-https://github.com/ccache/ccache/commit/a0edd4294f6a5a2d3f0c7b01273736f975f250e1
-https://github.com/ccache/ccache/commit/ef2e922f9642f943199138447b29ec53fa63ea68
-... gets us closer, but not there yet.)
-
-https://bugs.gentoo.org/837362 for 4.6 issue.
---- a/src/Config.cpp
-+++ b/src/Config.cpp
-@@ -1039,14 +1039,5 @@ Config::check_key_tables_consistency()
- std::string
- Config::default_temporary_dir(const std::string& cache_dir)
- {
-- static const std::string run_user_tmp_dir = [] {
--#ifdef HAVE_GETEUID
-- auto dir = FMT("/run/user/{}/ccache-tmp", geteuid());
-- if (Util::create_dir(dir) && access(dir.c_str(), W_OK) == 0) {
-- return dir;
-- }
--#endif
-- return std::string();
-- }();
-- return !run_user_tmp_dir.empty() ? run_user_tmp_dir : cache_dir + "/tmp";
-+ return cache_dir + "/tmp";
- }
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/
@ 2023-05-17 4:01 Sam James
0 siblings, 0 replies; 19+ messages in thread
From: Sam James @ 2023-05-17 4:01 UTC (permalink / raw
To: gentoo-commits
commit: 257fc52ad8a0d9fa867ed72b9e714dfe5f478555
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 17 04:00:57 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 17 04:01:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=257fc52a
dev-util/ccache: avoid /run usage (again)
Closes: https://bugs.gentoo.org/883799
Closes: https://bugs.gentoo.org/887019
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/ccache/ccache-4.8-r2.ebuild | 130 +++++++++++++++++++++
.../ccache/files/ccache-4.8-avoid-run-user.patch | 34 ++++++
2 files changed, 164 insertions(+)
diff --git a/dev-util/ccache/ccache-4.8-r2.ebuild b/dev-util/ccache/ccache-4.8-r2.ebuild
new file mode 100644
index 000000000000..1702d6d4b968
--- /dev/null
+++ b/dev-util/ccache/ccache-4.8-r2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# XXX: We don't use CCACHE_* for these vars like we do in e.g. cmake/libabigail/qemu
+# because Portage unsets them. Aaaah!
+#
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-ccache-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${MY_DOCS_PREBUILT:=1}
+
+MY_DOCS_PREBUILT_DEV=sam
+MY_DOCS_VERSION=$(ver_cut 1-2)
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+MY_DOCS_USEFLAG="+doc"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+if [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
+ SRC_URI+=" !doc? ( https://dev.gentoo.org/~${MY_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${MY_DOCS_VERSION}-docs.tar.xz )"
+ MY_DOCS_USEFLAG="doc"
+fi
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ app-arch/zstd:=
+ redis? ( dev-libs/hiredis:= )
+"
+RDEPEND="
+ ${DEPEND}
+ dev-util/shadowman
+ sys-apps/gentoo-functions
+"
+# Needed for eselect calls in pkg_*
+IDEPEND="dev-util/shadowman"
+
+# 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="
+ doc? ( dev-ruby/asciidoctor )
+ verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )
+"
+
+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.8-avoid-run-user.patch
+)
+
+src_unpack() {
+ # Avoid aborting on the doc tarball
+ if use verify-sig ; then
+ verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc}
+ fi
+
+ default
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ sed \
+ -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+ "${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_configure() {
+ # Mainly used in tests
+ tc-export CC OBJDUMP
+
+ # Avoid dependency on libstdc++.so. Useful for cases when
+ # we would like to use ccache to build older gcc which injects
+ # into ccache locally built (possibly outdated) libstdc++
+ # See bug #761220 for examples.
+ #
+ # Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
+ use static-c++ && append-ldflags -static-libstdc++
+
+ local mycmakeargs=(
+ -DENABLE_DOCUMENTATION=$(usex doc)
+ -DENABLE_TESTING=$(usex test)
+ -DZSTD_FROM_INTERNET=OFF
+ -DHIREDIS_FROM_INTERNET=OFF
+ -DREDIS_STORAGE_BACKEND=$(usex redis)
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ dobin ccache-config
+ insinto /usr/share/shadowman/tools
+ newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
+
+ # If USE=doc, there'll be newly generated docs which we install instead.
+ if ! use doc && [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
+ doman "${WORKDIR}"/${PN}-${MY_DOCS_VERSION}-docs/doc/*.[0-8]
+ fi
+}
+
+pkg_prerm() {
+ if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then
+ eselect compiler-shadow remove ccache
+ fi
+}
+
+pkg_postinst() {
+ if [[ -z ${ROOT} ]] ; then
+ eselect compiler-shadow update ccache
+ fi
+}
diff --git a/dev-util/ccache/files/ccache-4.8-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.8-avoid-run-user.patch
new file mode 100644
index 000000000000..51371464509c
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.8-avoid-run-user.patch
@@ -0,0 +1,34 @@
+Gentoo's sandbox does not whitelist this path by default yet.
+
+(4.1 update:
+https://github.com/ccache/ccache/issues/984
+https://github.com/ccache/ccache/issues/1044
+https://github.com/ccache/ccache/commit/a0edd4294f6a5a2d3f0c7b01273736f975f250e1
+https://github.com/ccache/ccache/commit/ef2e922f9642f943199138447b29ec53fa63ea68
+... gets us closer, but not there yet.)
+
+And see https://github.com/ccache/ccache/discussions/1086#discussioncomment-3327565.
+
+https://bugs.gentoo.org/837362 for 4.6 issue.
+https://bugs.gentoo.org/883799 and https://bugs.gentoo.org/887019 fo 4.8 issue.
+--- a/src/Config.cpp
++++ b/src/Config.cpp
+@@ -1147,17 +1147,5 @@ Config::check_key_tables_consistency()
+ std::string
+ Config::default_temporary_dir() const
+ {
+- static const std::string run_user_tmp_dir = [] {
+-#ifndef _WIN32
+- const char* const xdg_runtime_dir = getenv("XDG_RUNTIME_DIR");
+- if (xdg_runtime_dir && Stat::stat(xdg_runtime_dir).is_directory()) {
+- auto dir = FMT("{}/ccache-tmp", xdg_runtime_dir);
+- if (Util::create_dir(dir) && access(dir.c_str(), W_OK) == 0) {
+- return dir;
+- }
+- }
+-#endif
+- return std::string();
+- }();
+- return !run_user_tmp_dir.empty() ? run_user_tmp_dir : m_cache_dir + "/tmp";
++ return m_cache_dir + "/tmp";
+ }
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/
@ 2023-05-20 4:39 Sam James
0 siblings, 0 replies; 19+ messages in thread
From: Sam James @ 2023-05-20 4:39 UTC (permalink / raw
To: gentoo-commits
commit: ea57ee3c758c766e209d0d11b372d314ce924fc4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 20 04:39:14 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 20 04:39:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea57ee3c
dev-util/ccache: add 4.8.1 (unkeyworded)
unkw'd b/c of failing tests. Reported upstream at https://github.com/ccache/ccache/issues/1288.
I suspect ccache is actually fine though and it's just doctest.
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/ccache/Manifest | 2 +
dev-util/ccache/ccache-4.8.1.ebuild | 132 +++++++++++++++++++++
dev-util/ccache/files/ccache-4.8.1-test-typo.patch | 20 ++++
3 files changed, 154 insertions(+)
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index c6ab7452145f..b6ee9a4aee5a 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -3,5 +3,7 @@ DIST ccache-4.6.3.tar.xz.asc 833 BLAKE2B 064d7bdf474540992180372c4c011b5bdeb9883
DIST ccache-4.7.4.tar.xz 547820 BLAKE2B 03e03223f0fd6eb001c7d93bcd03a0ef6656ebd3ffcc920b9e772fb68275ddf1e8a941f8f7de68358cbc7a9b9d5aa65e35b91554ff24684f29ff1953aefae75f SHA512 48c663b51e874cfbd8daf0ef9759d025c2605c36da47ebbc77b52ceb941b810436600429f74204f13e2e2e601af6186a4bdb992f8da239f88cb9df4c6c95d58f
DIST ccache-4.7.4.tar.xz.asc 833 BLAKE2B e155f9cb695794a28771a928d50e18705441b9fb9a8ec425aabc78dabcd68caca68ba15f74ba176a73abf414c4ba98b1832da3536fcd87d7c32f2689fe7e1908 SHA512 567a051e7c93cd62c8ad7631fea98a6846e2f548aaa201acefbe44d1027f8048cae5ef462488da7ce90864b23a426d524f576472428f93ecbc5cea3ae224b860
DIST ccache-4.8-docs.tar.xz 80280 BLAKE2B e8e00dd10a00670ff3a0c3f5ab0966469fa5246de64724e24d0287020d4636fb5a1f59421aaa094d05b88bd20efd2a4a06e46dfb957bcf77ad2ea61fd02551c9 SHA512 e0036a7f86b458028c6e24158f95b62e40d9f659031e16adc59c067096bb728f1cb583a2edecaf2118f15b8e00f028fa6f1cfa2466fba76b7c870cca93a883eb
+DIST ccache-4.8.1.tar.xz 559628 BLAKE2B 01c676447aff5493f319df8360b5478b171a229dc47068bfda814bd30afeb28492a3b112532dbe93cf89d47796f4d682e37b22a1d1c31aaf46023e4f7682d80c SHA512 672971560a8aed7754c4280b8983fb185bc7f7f456651e952db3e32fb855ba430c7dcec1f45466e4d10aa59e80e30696f540d93b5f260a846a49dbf4901de514
+DIST ccache-4.8.1.tar.xz.asc 833 BLAKE2B 948ef7d7965717f42f27ee0858c36b2d6272629f190ddf96f7882463304cc103bd70aebda739686fd6176024356c8998d58642ef1d3b0e7943ef7898496ab689 SHA512 c89af05eec3eee8001098c77b27d67b084af06f406af32aafe71f11a2592df86bfe7ac58283749bb7ab3401046312da129c7262230a1a3f892b81946227dd0ad
DIST ccache-4.8.tar.xz 556804 BLAKE2B 5cca7d49088c5391abf93a2a493ba8e120575ae834abae86f3669e8c883a93ec29d48ab934aa086a87feb6a08d0c0053b3ce7174cec2f342c2d695a93fa3ef9a SHA512 561424d448a049971742b846429c2fa5f1df43c05f201610dab0a3fab7e4806589c14ca20875cb5733763603c0813fe9350a244b63dda03e9def95d547738d0b
DIST ccache-4.8.tar.xz.asc 833 BLAKE2B 4a646db5b7a220a21ad93a02ea4bad23a666ad116af70211ea4a9a546ba7aeaf0c1c88c79d264f614a2ca5387dc91bf655a1632f53889dd74f49e085e2f6bd01 SHA512 22b6aeb54248576a1199e173db7b58b985bdc4e6a298e9fbd32992ab6dbadcd4496ffcadc24241215bd43166b68faf77aa3e492e44ffeac53e1e5e4c46015836
diff --git a/dev-util/ccache/ccache-4.8.1.ebuild b/dev-util/ccache/ccache-4.8.1.ebuild
new file mode 100644
index 000000000000..37009fdc79b4
--- /dev/null
+++ b/dev-util/ccache/ccache-4.8.1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# XXX: We don't use CCACHE_* for these vars like we do in e.g. cmake/libabigail/qemu
+# because Portage unsets them. Aaaah!
+#
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-ccache-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${MY_DOCS_PREBUILT:=1}
+
+MY_DOCS_PREBUILT_DEV=sam
+MY_DOCS_VERSION=$(ver_cut 1-2)
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+MY_DOCS_USEFLAG="+doc"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+if [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
+ SRC_URI+=" !doc? ( https://dev.gentoo.org/~${MY_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${MY_DOCS_VERSION}-docs.tar.xz )"
+ MY_DOCS_USEFLAG="doc"
+fi
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+# Unkeyworded for now because of failing tests: https://github.com/ccache/ccache/issues/1288
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ app-arch/zstd:=
+ redis? ( dev-libs/hiredis:= )
+"
+RDEPEND="
+ ${DEPEND}
+ dev-util/shadowman
+ sys-apps/gentoo-functions
+"
+# Needed for eselect calls in pkg_*
+IDEPEND="dev-util/shadowman"
+
+# 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="
+ doc? ( dev-ruby/asciidoctor )
+ verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )
+"
+
+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.8-avoid-run-user.patch
+ "${FILESDIR}"/${P}-test-typo.patch
+)
+
+src_unpack() {
+ # Avoid aborting on the doc tarball
+ if use verify-sig ; then
+ verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc}
+ fi
+
+ default
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ sed \
+ -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+ "${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_configure() {
+ # Mainly used in tests
+ tc-export CC OBJDUMP
+
+ # Avoid dependency on libstdc++.so. Useful for cases when
+ # we would like to use ccache to build older gcc which injects
+ # into ccache locally built (possibly outdated) libstdc++
+ # See bug #761220 for examples.
+ #
+ # Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
+ use static-c++ && append-ldflags -static-libstdc++
+
+ local mycmakeargs=(
+ -DENABLE_DOCUMENTATION=$(usex doc)
+ -DENABLE_TESTING=$(usex test)
+ -DZSTD_FROM_INTERNET=OFF
+ -DHIREDIS_FROM_INTERNET=OFF
+ -DREDIS_STORAGE_BACKEND=$(usex redis)
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ dobin ccache-config
+ insinto /usr/share/shadowman/tools
+ newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
+
+ # If USE=doc, there'll be newly generated docs which we install instead.
+ if ! use doc && [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
+ doman "${WORKDIR}"/${PN}-${MY_DOCS_VERSION}-docs/doc/*.[0-8]
+ fi
+}
+
+pkg_prerm() {
+ if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then
+ eselect compiler-shadow remove ccache
+ fi
+}
+
+pkg_postinst() {
+ if [[ -z ${ROOT} ]] ; then
+ eselect compiler-shadow update ccache
+ fi
+}
diff --git a/dev-util/ccache/files/ccache-4.8.1-test-typo.patch b/dev-util/ccache/files/ccache-4.8.1-test-typo.patch
new file mode 100644
index 000000000000..f557d24e6e93
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.8.1-test-typo.patch
@@ -0,0 +1,20 @@
+https://github.com/ccache/ccache/pull/1287
+
+From efad3d7c1d18a260b694904fe695e6abd7dfd4df Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 20 May 2023 05:30:54 +0100
+Subject: [PATCH] test: Fix typo (missing line continuation)
+
+Fixes: ef634bdb292e1e24b8d1b5490e7857144a77c0fd
+--- a/test/suites/base.bash
++++ b/test/suites/base.bash
+@@ -552,7 +552,7 @@ fi
+ # -------------------------------------------------------------------------
+ TEST "Directory is not hashed if using -gz"
+
+- if $COMPILER -c test1.c -gz 2>/dev/null
++ if $COMPILER -c test1.c -gz 2>/dev/null \
+ && $COMPILER -E test1.c -gz >preprocessed.i 2>/dev/null \
+ && [ -s preprocessed.i ] \
+ && ! grep -Fq $PWD preprocessed.i; then
+
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/
@ 2024-02-07 19:20 Sam James
0 siblings, 0 replies; 19+ messages in thread
From: Sam James @ 2024-02-07 19:20 UTC (permalink / raw
To: gentoo-commits
commit: 6cfab692a4eef1b616f6b5fda4592f289e62b42a
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Wed Feb 7 07:09:32 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 7 19:20:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cfab692
dev-util/ccache: use prefix.eclass to inject eprefix into ccache-config
It is a slightly simpler ebuild handling, and avoids QA warnings from
iwdevtools when the sed doesn't apply.
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/ccache/ccache-4.8.3.ebuild | 9 ++++-----
dev-util/ccache/ccache-4.9.1.ebuild | 7 +++----
dev-util/ccache/ccache-4.9.ebuild | 7 +++----
dev-util/ccache/files/ccache-config-3 | 2 +-
4 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/dev-util/ccache/ccache-4.8.3.ebuild b/dev-util/ccache/ccache-4.8.3.ebuild
index 554266100f5b..8c1e04988bf3 100644
--- a/dev-util/ccache/ccache-4.8.3.ebuild
+++ b/dev-util/ccache/ccache-4.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,7 +18,7 @@ MY_DOCS_VERSION=$(ver_cut 1-2)
MY_DOCS_USEFLAG="+doc"
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/joelrosdahl.asc
-inherit cmake toolchain-funcs flag-o-matic verify-sig
+inherit cmake toolchain-funcs flag-o-matic prefix verify-sig
DESCRIPTION="Fast compiler cache"
HOMEPAGE="https://ccache.dev/"
@@ -78,9 +78,8 @@ src_unpack() {
src_prepare() {
cmake_src_prepare
- sed \
- -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
- "${FILESDIR}"/ccache-config-3 > ccache-config || die
+ cp "${FILESDIR}"/ccache-config-3 ccache-config || die
+ eprefixify ccache-config
}
src_configure() {
diff --git a/dev-util/ccache/ccache-4.9.1.ebuild b/dev-util/ccache/ccache-4.9.1.ebuild
index 108c29bbdd7a..73795e42934e 100644
--- a/dev-util/ccache/ccache-4.9.1.ebuild
+++ b/dev-util/ccache/ccache-4.9.1.ebuild
@@ -18,7 +18,7 @@ MY_DOCS_VERSION=$(ver_cut 1-2)
MY_DOCS_USEFLAG="+doc"
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/joelrosdahl.asc
-inherit cmake toolchain-funcs flag-o-matic verify-sig
+inherit cmake toolchain-funcs flag-o-matic prefix verify-sig
DESCRIPTION="Fast compiler cache"
HOMEPAGE="https://ccache.dev/"
@@ -78,9 +78,8 @@ src_unpack() {
src_prepare() {
cmake_src_prepare
- sed \
- -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
- "${FILESDIR}"/ccache-config-3 > ccache-config || die
+ cp "${FILESDIR}"/ccache-config-3 ccache-config || die
+ eprefixify ccache-config
}
src_configure() {
diff --git a/dev-util/ccache/ccache-4.9.ebuild b/dev-util/ccache/ccache-4.9.ebuild
index 68cf3874b664..ae1a041c2953 100644
--- a/dev-util/ccache/ccache-4.9.ebuild
+++ b/dev-util/ccache/ccache-4.9.ebuild
@@ -18,7 +18,7 @@ MY_DOCS_VERSION=$(ver_cut 1-2)
MY_DOCS_USEFLAG="+doc"
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/joelrosdahl.asc
-inherit cmake toolchain-funcs flag-o-matic verify-sig
+inherit cmake toolchain-funcs flag-o-matic prefix verify-sig
DESCRIPTION="Fast compiler cache"
HOMEPAGE="https://ccache.dev/"
@@ -78,9 +78,8 @@ src_unpack() {
src_prepare() {
cmake_src_prepare
- sed \
- -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
- "${FILESDIR}"/ccache-config-3 > ccache-config || die
+ cp "${FILESDIR}"/ccache-config-3 ccache-config || die
+ eprefixify ccache-config
}
src_configure() {
diff --git a/dev-util/ccache/files/ccache-config-3 b/dev-util/ccache/files/ccache-config-3
index 7f604f0016ef..631d671794d8 100644
--- a/dev-util/ccache/files/ccache-config-3
+++ b/dev-util/ccache/files/ccache-config-3
@@ -11,7 +11,7 @@
#
# Additional features to come; this provides a starting point
-EPREFIX=''
+EPREFIX='@GENTOO_PORTAGE_EPREFIX@'
. "${EPREFIX}"/lib/gentoo/functions.sh 2>/dev/null || {
ebegin() { echo " * $* ..."; }
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/
@ 2024-03-24 18:02 Sam James
0 siblings, 0 replies; 19+ messages in thread
From: Sam James @ 2024-03-24 18:02 UTC (permalink / raw
To: gentoo-commits
commit: baacb85f312792e72d5f289d841d78a28e14a05a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 18:02:13 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 18:02:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baacb85f
dev-util/ccache: backport fix for distcc
Thanks to satmd for reporting.
Closes: https://bugs.gentoo.org/927740
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/ccache/ccache-4.9.1-r1.ebuild | 132 ++++++++++++++++++++++++
dev-util/ccache/files/ccache-4.9.1-distcc.patch | 38 +++++++
2 files changed, 170 insertions(+)
diff --git a/dev-util/ccache/ccache-4.9.1-r1.ebuild b/dev-util/ccache/ccache-4.9.1-r1.ebuild
new file mode 100644
index 000000000000..8bac5338f821
--- /dev/null
+++ b/dev-util/ccache/ccache-4.9.1-r1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# XXX: We don't use CCACHE_* for these vars like we do in e.g. cmake/libabigail/qemu
+# because Portage unsets them. Aaaah!
+#
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-ccache-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${MY_DOCS_PREBUILT:=1}
+
+MY_DOCS_PREBUILT_DEV=sam
+MY_DOCS_VERSION=$(ver_cut 1-2)
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+MY_DOCS_USEFLAG="+doc"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic prefix verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+if [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
+ SRC_URI+=" !doc? ( https://dev.gentoo.org/~${MY_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${MY_DOCS_VERSION}-docs.tar.xz )"
+ MY_DOCS_USEFLAG="doc"
+fi
+
+# https://ccache.dev/license.html
+LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
+LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ app-arch/zstd:=
+ redis? ( dev-libs/hiredis:= )
+"
+RDEPEND="
+ ${DEPEND}
+ dev-util/shadowman
+ sys-apps/gentoo-functions
+"
+# Needed for eselect calls in pkg_*
+IDEPEND="dev-util/shadowman"
+
+# 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="
+ doc? ( dev-ruby/asciidoctor )
+ verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )
+"
+
+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.9-avoid-run-user.patch
+ "${FILESDIR}"/${P}-distcc.patch
+)
+
+src_unpack() {
+ # Avoid aborting on the doc tarball
+ if use verify-sig ; then
+ verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc}
+ fi
+
+ default
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ cp "${FILESDIR}"/ccache-config-3 ccache-config || die
+ eprefixify ccache-config
+}
+
+src_configure() {
+ # Mainly used in tests
+ tc-export CC OBJDUMP
+
+ # Avoid dependency on libstdc++.so. Useful for cases when
+ # we would like to use ccache to build older gcc which injects
+ # into ccache locally built (possibly outdated) libstdc++
+ # See bug #761220 for examples.
+ #
+ # Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
+ use static-c++ && append-ldflags -static-libstdc++
+
+ local mycmakeargs=(
+ -DENABLE_DOCUMENTATION=$(usex doc)
+ -DENABLE_TESTING=$(usex test)
+ -DZSTD_FROM_INTERNET=OFF
+ -DHIREDIS_FROM_INTERNET=OFF
+ -DREDIS_STORAGE_BACKEND=$(usex redis)
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ dobin ccache-config
+ insinto /usr/share/shadowman/tools
+ newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
+
+ # If USE=doc, there'll be newly generated docs which we install instead.
+ if ! use doc && [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
+ doman "${WORKDIR}"/${PN}-${MY_DOCS_VERSION}-docs/doc/*.[0-8]
+ fi
+}
+
+pkg_prerm() {
+ if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then
+ eselect compiler-shadow remove ccache
+ fi
+}
+
+pkg_postinst() {
+ if [[ -z ${ROOT} ]] ; then
+ eselect compiler-shadow update ccache
+ fi
+}
diff --git a/dev-util/ccache/files/ccache-4.9.1-distcc.patch b/dev-util/ccache/files/ccache-4.9.1-distcc.patch
new file mode 100644
index 000000000000..412e2562ae76
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.9.1-distcc.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/927740
+https://github.com/ccache/ccache/issues/1406
+https://github.com/ccache/ccache/commit/33d390bb249ddf1a6b3bdecede71b12c70000da3
+
+From 33d390bb249ddf1a6b3bdecede71b12c70000da3 Mon Sep 17 00:00:00 2001
+From: Joel Rosdahl <joel@rosdahl.net>
+Date: Wed, 21 Feb 2024 20:25:03 +0100
+Subject: [PATCH] fix: Allow nonexistent include files in preprocessor mode
+
+After 43c3a44aadcb nonexistent include files found in the preprocessed
+output would increment "Could not read or parse input file" and fall
+back to just running the compiler. This made ccache not attempt
+preprocessor mode for generated code with #line header referencing files
+that can't be found, e.g. in an out-of-source build scenario.
+
+Fix this by just disabling direct mode, restoring the pre-43c3a44aadcb
+behavior in such cases.
+
+Fixes #1406.
+
+(cherry picked from commit 08da6cd4da41fa213d387f52e3cf1d1f2a42366b)
+--- a/src/ccache.cpp
++++ b/src/ccache.cpp
+@@ -352,7 +352,12 @@ remember_include_file(Context& ctx,
+
+ DirEntry dir_entry(path, DirEntry::LogOnError::yes);
+ if (!dir_entry.exists()) {
+- return tl::unexpected(Statistic::bad_input_file);
++ if (ctx.config.direct_mode()) {
++ LOG("Include file {} does not exist, disabling direct mode",
++ dir_entry.path());
++ ctx.config.set_direct_mode(false);
++ }
++ return {};
+ }
+ if (dir_entry.is_directory()) {
+ // Ignore directory, typically $PWD.
+
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/
@ 2024-05-31 18:46 Sam James
0 siblings, 0 replies; 19+ messages in thread
From: Sam James @ 2024-05-31 18:46 UTC (permalink / raw
To: gentoo-commits
commit: 0862af03fc9715f548e1332b40664432aeea616d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 31 18:45:57 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 31 18:45:57 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0862af03
dev-util/ccache: unbundle blake3 too
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{ccache-4.10.ebuild => ccache-4.10-r1.ebuild} | 5 +-
dev-util/ccache/files/ccache-4.10-blake3.patch | 79 ++++++++++++++++++++++
2 files changed, 82 insertions(+), 2 deletions(-)
diff --git a/dev-util/ccache/ccache-4.10.ebuild b/dev-util/ccache/ccache-4.10-r1.ebuild
similarity index 96%
rename from dev-util/ccache/ccache-4.10.ebuild
rename to dev-util/ccache/ccache-4.10-r1.ebuild
index cf2714cb487b..a52907e3e3e0 100644
--- a/dev-util/ccache/ccache-4.10.ebuild
+++ b/dev-util/ccache/ccache-4.10-r1.ebuild
@@ -34,17 +34,17 @@ fi
LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0"
LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~riscv ~sparc ~x86"
# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
RESTRICT="!test? ( test )"
# TODO: package NonstdSpan, TlExpected
-# TODO: figure out why blake3 can't be found
# TODO: upstream httplib patch
DEPEND="
>=app-arch/zstd-1.3.4:=
>=dev-cpp/cpp-httplib-0.10.6:=
+ >=dev-libs/blake3-1.4.0:=
>=dev-libs/libfmt-8.0.0:=
>=dev-libs/xxhash-0.8.0
redis? ( >=dev-libs/hiredis-0.13.3:= )
@@ -75,6 +75,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.0-objdump.patch
"${FILESDIR}"/${PN}-4.10-avoid-run-user.patch
"${FILESDIR}"/${PN}-4.10-unittest-httplib.patch
+ "${FILESDIR}"/${P}-blake3.patch
)
src_unpack() {
diff --git a/dev-util/ccache/files/ccache-4.10-blake3.patch b/dev-util/ccache/files/ccache-4.10-blake3.patch
new file mode 100644
index 000000000000..5789051200eb
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.10-blake3.patch
@@ -0,0 +1,79 @@
+https://github.com/ccache/ccache/pull/1464
+
+From d159306db8398da233df6481ac3fd83460ef0f0b Mon Sep 17 00:00:00 2001
+From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com>
+Date: Thu, 30 May 2024 19:26:41 +0800
+Subject: [PATCH 1/4] Fix detection of system blake3
+
+The existing code mistakenly always rejects the system version as too old because it doesn't parse the version from the header correctly.
+
+This change fixes that.
+--- a/cmake/FindBlake3.cmake
++++ b/cmake/FindBlake3.cmake
+@@ -8,7 +8,7 @@ else()
+ find_library(BLAKE3_LIBRARY blake3)
+ if(BLAKE3_INCLUDE_DIR)
+ file(READ "${BLAKE3_INCLUDE_DIR}/blake3.h" _blake3_h)
+- string(REGEX MATCH "#define _blake3_version_string \"([0-9]+).([0-9]+).*([0-9]+)\"" _ "${_blake3_h}")
++ string(REGEX MATCH "#define BLAKE3_VERSION_STRING \"([0-9]+).([0-9]+).*([0-9]+)\"" _ "${_blake3_h}")
+ set(_blake3_version_string "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}")
+ if(NOT "${CMAKE_MATCH_0}" STREQUAL "" AND "${_blake3_version_string}" VERSION_GREATER_EQUAL "${Blake3_FIND_VERSION}")
+ if(BLAKE3_LIBRARY)
+
+From fa4046966e71011587364b0241255130b62858fb Mon Sep 17 00:00:00 2001
+From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com>
+Date: Thu, 30 May 2024 19:43:11 +0800
+Subject: [PATCH 2/4] Fix blake3 include in Hash.hpp
+
+System installations of blake3 install the `blake3.h` header directly into the `include` directory and not into a `blake3` subdirectory.
+--- a/src/ccache/Hash.hpp
++++ b/src/ccache/Hash.hpp
+@@ -21,7 +21,7 @@
+ #include <ccache/util/PathString.hpp>
+ #include <ccache/util/conversion.hpp>
+
+-#include <blake3/blake3.h>
++#include <blake3.h>
+ #include <nonstd/span.hpp>
+ #include <tl/expected.hpp>
+
+
+From 36f8eeea1cb986440f51c1eee9db563493103462 Mon Sep 17 00:00:00 2001
+From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com>
+Date: Thu, 30 May 2024 19:44:53 +0800
+Subject: [PATCH 3/4] Fix include path for bundled blake3
+
+We modified the include directive for `blake3.h` in `Hash.hpp`, so we need this in order for builds that use the bundled blake3 to keep working.
+--- a/src/third_party/blake3/CMakeLists.txt
++++ b/src/third_party/blake3/CMakeLists.txt
+@@ -7,7 +7,7 @@ add_library(
+ "${CMAKE_CURRENT_SOURCE_DIR}/blake3/blake3_portable.c"
+ )
+
+-target_include_directories(dep_blake3 INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
++target_include_directories(dep_blake3 INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/blake3")
+ target_link_libraries(dep_blake3 PRIVATE standard_settings)
+
+ if(MSVC)
+
+From 8cc68bc6f3ec8dadcb6a1244c76d865536f91be7 Mon Sep 17 00:00:00 2001
+From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com>
+Date: Thu, 30 May 2024 19:52:59 +0800
+Subject: [PATCH 4/4] Fix `clang-format` failure
+
+--- a/src/ccache/Hash.hpp
++++ b/src/ccache/Hash.hpp
+@@ -21,10 +21,11 @@
+ #include <ccache/util/PathString.hpp>
+ #include <ccache/util/conversion.hpp>
+
+-#include <blake3.h>
+ #include <nonstd/span.hpp>
+ #include <tl/expected.hpp>
+
++#include <blake3.h>
++
+ #include <array>
+ #include <cstdint>
+ #include <cstdio>
+
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/
@ 2024-08-10 20:02 Sam James
0 siblings, 0 replies; 19+ messages in thread
From: Sam James @ 2024-08-10 20:02 UTC (permalink / raw
To: gentoo-commits
commit: afe458f45b86a439985e0c6cae53912d487bc88e
Author: Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com>
AuthorDate: Thu Jul 25 21:00:37 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 20:02:09 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afe458f4
dev-util/ccache: fix compilation with libfmt >=10
Closes: https://bugs.gentoo.org/935291
Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com>
Closes: https://github.com/gentoo/gentoo/pull/37725
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/ccache/ccache-4.10.1.ebuild | 1 +
dev-util/ccache/files/ccache-4.10-libfmt11.patch | 85 ++++++++++++++++++++++++
2 files changed, 86 insertions(+)
diff --git a/dev-util/ccache/ccache-4.10.1.ebuild b/dev-util/ccache/ccache-4.10.1.ebuild
index f50d51039e24..9b08f52780fa 100644
--- a/dev-util/ccache/ccache-4.10.1.ebuild
+++ b/dev-util/ccache/ccache-4.10.1.ebuild
@@ -73,6 +73,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
"${FILESDIR}"/${PN}-4.0-objdump.patch
"${FILESDIR}"/${PN}-4.10-avoid-run-user.patch
+ "${FILESDIR}"/${PN}-4.10-libfmt11.patch
)
src_unpack() {
diff --git a/dev-util/ccache/files/ccache-4.10-libfmt11.patch b/dev-util/ccache/files/ccache-4.10-libfmt11.patch
new file mode 100644
index 000000000000..37ed2167611a
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.10-libfmt11.patch
@@ -0,0 +1,85 @@
+
+Patch from:
+https://github.com/ccache/ccache/commit/71f772e9d3d4f8045cfa7bccd03bd21c1e8fbef1
+
+From db136b6819d95bb53582e4fea8c328029c8f5681 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
+Date: Tue, 2 Jul 2024 12:53:04 +0200
+Subject: [PATCH] build: Try harder to determine FMT_VERSION
+
+fmt-11.0 moved the FMT_VERSION from core.h to base.h, so try the
+new header first and then fall back to the old one.
+
+Closes: #1477
+---
+ cmake/FindFmt.cmake | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/FindFmt.cmake b/cmake/FindFmt.cmake
+index 55126a3172..0619f4615e 100644
+--- a/cmake/FindFmt.cmake
++++ b/cmake/FindFmt.cmake
+@@ -3,11 +3,19 @@ mark_as_advanced(FMT_INCLUDE_DIR FMT_LIBRARY)
+ if(DEP_FMT STREQUAL "BUNDLED")
+ message(STATUS "Using bundled Fmt as requested")
+ else()
+- find_path(FMT_INCLUDE_DIR fmt/core.h)
++ find_path(FMT_INCLUDE_DIR fmt/base.h fmt/core.h)
+ find_library(FMT_LIBRARY fmt)
+ if(FMT_INCLUDE_DIR AND FMT_LIBRARY)
+- file(READ "${FMT_INCLUDE_DIR}/fmt/core.h" _fmt_core_h)
+- string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_core_h}")
++ file(READ "${FMT_INCLUDE_DIR}/fmt/base.h" _fmt_base_h)
++ string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_base_h}")
++ if("${CMAKE_MATCH_0}" STREQUAL "")
++ file(READ "${FMT_INCLUDE_DIR}/fmt/core.h" _fmt_core_h)
++ string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_core_h}")
++ endif()
++ if("${CMAKE_MATCH_0}" STREQUAL "")
++ message(FATAL_ERROR "FMT_VERSION not found")
++ return()
++ endif()
+ math(EXPR _fmt_major "${CMAKE_MATCH_1} / 10000")
+ math(EXPR _fmt_minor "${CMAKE_MATCH_1} / 100 % 100")
+ math(EXPR _fmt_patch "${CMAKE_MATCH_1} % 100")
+
+Patch from:
+https://github.com/ccache/ccache/commit/3b09afc5f792f0bd0a15cf6b8408ea40eb069787
+
+From 3b09afc5f792f0bd0a15cf6b8408ea40eb069787 Mon Sep 17 00:00:00 2001
+From: Joel Rosdahl <joel@rosdahl.net>
+Date: Tue, 2 Jul 2024 17:05:43 +0200
+Subject: [PATCH] build: Fix detection of Fmt version for Fmt<11
+
+Fixes regression in 71f772e9d3d4f8045cfa7bccd03bd21c1e8fbef1.
+---
+ cmake/FindFmt.cmake | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/cmake/FindFmt.cmake b/cmake/FindFmt.cmake
+index 0619f4615e..7c39291eca 100644
+--- a/cmake/FindFmt.cmake
++++ b/cmake/FindFmt.cmake
+@@ -3,15 +3,16 @@ mark_as_advanced(FMT_INCLUDE_DIR FMT_LIBRARY)
+ if(DEP_FMT STREQUAL "BUNDLED")
+ message(STATUS "Using bundled Fmt as requested")
+ else()
+- find_path(FMT_INCLUDE_DIR fmt/base.h fmt/core.h)
++ find_path(FMT_INCLUDE_DIR NAMES fmt/base.h fmt/core.h)
+ find_library(FMT_LIBRARY fmt)
+ if(FMT_INCLUDE_DIR AND FMT_LIBRARY)
+- file(READ "${FMT_INCLUDE_DIR}/fmt/base.h" _fmt_base_h)
+- string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_base_h}")
+- if("${CMAKE_MATCH_0}" STREQUAL "")
+- file(READ "${FMT_INCLUDE_DIR}/fmt/core.h" _fmt_core_h)
+- string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_core_h}")
++ if(EXISTS "${FMT_INCLUDE_DIR}/fmt/base.h")
++ set(_fmt_h base.h)
++ else()
++ set(_fmt_h core.h)
+ endif()
++ file(READ "${FMT_INCLUDE_DIR}/fmt/${_fmt_h}" _fmt_h_content)
++ string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_h_content}")
+ if("${CMAKE_MATCH_0}" STREQUAL "")
+ message(FATAL_ERROR "FMT_VERSION not found")
+ return()
^ permalink raw reply related [flat|nested] 19+ messages in thread
end of thread, other threads:[~2024-08-10 20:02 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-22 21:08 [gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-08-10 20:02 Sam James
2024-05-31 18:46 Sam James
2024-03-24 18:02 Sam James
2024-02-07 19:20 Sam James
2023-05-20 4:39 Sam James
2023-05-17 4:01 Sam James
2022-09-23 1:56 Sam James
2022-05-20 19:26 Matt Turner
2022-04-09 11:26 Sam James
2022-04-09 4:30 Sam James
2021-06-18 10:15 Sergei Trofimovich
2020-11-18 19:07 Sergei Trofimovich
2020-10-19 18:49 Sergei Trofimovich
2019-02-02 23:40 Sergei Trofimovich
2019-01-04 21:13 Sergei Trofimovich
2018-10-15 21:13 Sergei Trofimovich
2018-08-15 8:39 Sergei Trofimovich
2016-05-27 20:40 Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox