Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH eutils] Die if epunt_cxx is called unnecessarily.
Date: Wed, 30 Jan 2013 21:36:15
Message-Id: 1359581813-1973-1-git-send-email-mgorny@gentoo.org
1 Currently, epunt_cxx always succeeds. This results in some
2 of the ebuilds keeping its use even though the C++ checks were removed
3 upstream.
4
5 Therefore, I'm suggesting to add a simple check to the function -- if
6 none of the patching attempts succeed, die requesting the user to remove
7 the invocation.
8 ---
9 gx86/eclass/eutils.eclass | 8 ++++++--
10 1 file changed, 6 insertions(+), 2 deletions(-)
11
12 diff --git a/gx86/eclass/eutils.eclass b/gx86/eclass/eutils.eclass
13 index 6588792..9d77389 100644
14 --- a/gx86/eclass/eutils.eclass
15 +++ b/gx86/eclass/eutils.eclass
16 @@ -1269,10 +1269,14 @@ epunt_cxx() {
17 local dir=$1
18 [[ -z ${dir} ]] && dir=${S}
19 ebegin "Removing useless C++ checks"
20 - local f
21 + local f any_found
22 find "${dir}" -name configure | while read f ; do
23 - patch --no-backup-if-mismatch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
24 + patch --no-backup-if-mismatch -p0 "${f}" \
25 + "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null \
26 + && any_found=1
27 done
28 +
29 + [[ -n ${any_found} ]] || die "No C++ checks to punt."
30 eend 0
31 }
32
33 --
34 1.8.1.2

Replies