Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r11603 - main/trunk/bin
Date: Wed, 01 Oct 2008 17:43:42
Message-Id: E1Kl5je-0001HO-TH@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-10-01 17:43:37 +0000 (Wed, 01 Oct 2008)
3 New Revision: 11603
4
5 Modified:
6 main/trunk/bin/ebuild.sh
7 Log:
8 Generate an eqawarn message if econf is called from src_compile and
9 src_configure is also defined. Thanks to Betelgeuse for the patch which
10 I've modified to be silent in EAPI 0 or 1 in case ebuilds want to define
11 src_configure in those EAPIs and call it manually from src_compile.
12
13
14 Modified: main/trunk/bin/ebuild.sh
15 ===================================================================
16 --- main/trunk/bin/ebuild.sh 2008-09-30 15:16:03 UTC (rev 11602)
17 +++ main/trunk/bin/ebuild.sh 2008-10-01 17:43:37 UTC (rev 11603)
18 @@ -436,6 +436,10 @@
19 local x
20 local LOCAL_EXTRA_ECONF="${EXTRA_ECONF}"
21
22 + ! hasq "$EAPI" 0 1 && [[ $EBUILD_PHASE = compile && \
23 + $(type -t src_configure) = function ]] && \
24 + eqawarn "econf called in src_compile instead of src_configure"
25 +
26 if [ -z "${ECONF_SOURCE}" ]; then
27 ECONF_SOURCE="."
28 fi