Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sat, 11 Jan 2020 21:35:22
Message-Id: 1578778513.447de7a8a31b6878e12033334e0ac19b16a0f6a1.slyfox@gentoo
1 commit: 447de7a8a31b6878e12033334e0ac19b16a0f6a1
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 11 21:34:34 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 11 21:35:13 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=447de7a8
7
8 toolchain.eclass: allow applying patchsets to live ebuilds
9
10 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
11
12 eclass/toolchain.eclass | 6 ++++--
13 1 file changed, 4 insertions(+), 2 deletions(-)
14
15 diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
16 index 64c38828a2e..5f9bd7750dd 100644
17 --- a/eclass/toolchain.eclass
18 +++ b/eclass/toolchain.eclass
19 @@ -438,9 +438,9 @@ toolchain_pkg_setup() {
20 toolchain_src_unpack() {
21 if [[ ${PV} == *9999* ]]; then
22 git-r3_src_unpack
23 - else
24 - gcc_quick_unpack
25 fi
26 +
27 + gcc_quick_unpack
28 }
29
30 gcc_quick_unpack() {
31 @@ -455,6 +455,8 @@ gcc_quick_unpack() {
32 # 'GCC_A_FAKEIT' to specify it's own source and binary tarballs.
33 if [[ -n ${GCC_A_FAKEIT} ]] ; then
34 unpack ${GCC_A_FAKEIT}
35 + elif [[ ${PV} == *9999* ]]; then
36 + : # sources comes from git, not tarball
37 elif [[ -n ${PRERELEASE} ]] ; then
38 unpack gcc-${PRERELEASE}.tar.bz2
39 elif [[ -n ${SNAPSHOT} ]] ; then