Gentoo Archives: gentoo-portage-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-portage-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-portage-dev] [PATCH] Add empty default src_prepare() as required by PMS
Date: Mon, 22 Sep 2014 15:57:03
Message-Id: 1411401413-5662-1-git-send-email-mgorny@gentoo.org
1 Fixes: https://bugs.gentoo.org/show_bug.cgi?id=523182
2 ---
3 bin/phase-functions.sh | 4 ++++
4 bin/phase-helpers.sh | 4 ++++
5 2 files changed, 8 insertions(+)
6
7 diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
8 index 9bc3eb5..9117719 100644
9 --- a/bin/phase-functions.sh
10 +++ b/bin/phase-functions.sh
11 @@ -799,6 +799,8 @@ __ebuild_phase_funcs() {
12 default_src_test() { __eapi0_src_test; }
13
14 # defaults starting with EAPI 2
15 + [[ ${phase_func} == src_prepare ]] && \
16 + default_src_prepare() { __eapi2_src_prepare; }
17 [[ ${phase_func} == src_configure ]] && \
18 default_src_configure() { __eapi2_src_configure; }
19 [[ ${phase_func} == src_compile ]] && \
20 @@ -807,6 +809,8 @@ __ebuild_phase_funcs() {
21 # bind supported phases to the defaults
22 declare -F src_unpack >/dev/null || \
23 src_unpack() { default; }
24 + declare -F src_prepare >/dev/null || \
25 + src_prepare() { default; }
26 declare -F src_configure >/dev/null || \
27 src_configure() { default; }
28 declare -F src_compile >/dev/null || \
29 diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
30 index ca28ce9..5f7c809 100644
31 --- a/bin/phase-helpers.sh
32 +++ b/bin/phase-helpers.sh
33 @@ -682,6 +682,10 @@ __eapi1_src_compile() {
34 __eapi2_src_compile
35 }
36
37 +__eapi2_src_prepare() {
38 + :
39 +}
40 +
41 __eapi2_src_configure() {
42 if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
43 econf
44 --
45 2.1.1

Replies