[gentoo-dev] [PATCH eutils] Die if epunt_cxx is called unnecessarily.

[gentoo-dev] [PATCH eutils] Die if epunt_cxx is called unnecessarily.

[Michał Górny]

Currently, epunt_cxx always succeeds. This results in some
of the ebuilds keeping its use even though the C++ checks were removed
upstream.

Therefore, I'm suggesting to add a simple check to the function -- if
none of the patching attempts succeed, die requesting the user to remove
the invocation.
---
 gx86/eclass/eutils.eclass | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gx86/eclass/eutils.eclass b/gx86/eclass/eutils.eclass
index 6588792..9d77389 100644
--- a/gx86/eclass/eutils.eclass
+++ b/gx86/eclass/eutils.eclass
@@ -1269,10 +1269,14 @@ epunt_cxx() {
 	local dir=$1
 	[[ -z ${dir} ]] && dir=${S}
 	ebegin "Removing useless C++ checks"
-	local f
+	local f any_found
 	find "${dir}" -name configure | while read f ; do
-		patch --no-backup-if-mismatch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
+		patch --no-backup-if-mismatch -p0 "${f}" \
+			"${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null \
+			&& any_found=1
 	done
+
+	[[ -n ${any_found} ]] || die "No C++ checks to punt."
 	eend 0
 }
 
-- 
1.8.1.2

Re: [gentoo-dev] Re: [PATCH eutils] Die if epunt_cxx is called unnecessarily.

[Michał Górny]

[-- Attachment #1: Type: text/plain, Size: 609 bytes --]

On Wed, 30 Jan 2013 17:57:20 -0600
Ryan Hill <dirtyepic@gentoo.org> wrote:

> On Wed, 30 Jan 2013 22:36:53 +0100
> Michał Górny <mgorny@gentoo.org> wrote:
> 
> > Currently, epunt_cxx always succeeds. This results in some
> > of the ebuilds keeping its use even though the C++ checks were removed
> > upstream.
> > 
> > Therefore, I'm suggesting to add a simple check to the function -- if
> > none of the patching attempts succeed, die requesting the user to remove
> > the invocation.
> 
> eqawarn?

Yes, eqawarn if we don't want users to be hurt :P.

-- 
Best regards,
Michał Górny

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 316 bytes --]

[gentoo-dev] Re: [PATCH eutils] Die if epunt_cxx is called unnecessarily.

[Ryan Hill]

[-- Attachment #1: Type: text/plain, Size: 596 bytes --]

On Wed, 30 Jan 2013 22:36:53 +0100
Michał Górny <mgorny@gentoo.org> wrote:

> Currently, epunt_cxx always succeeds. This results in some
> of the ebuilds keeping its use even though the C++ checks were removed
> upstream.
> 
> Therefore, I'm suggesting to add a simple check to the function -- if
> none of the patching attempts succeed, die requesting the user to remove
> the invocation.

eqawarn?


-- 
gcc-porting
toolchain, wxwidgets            learn a language baby, it's that kind of place
@ gentoo.org                   where low card is hunger and high card is taste

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

[gentoo-dev] Re: [PATCH eutils] Die if epunt_cxx is called unnecessarily.

[Ryan Hill]

[-- Attachment #1: Type: text/plain, Size: 984 bytes --]

On Thu, 31 Jan 2013 00:53:06 +0100
Michał Górny <mgorny@gentoo.org> wrote:

> On Wed, 30 Jan 2013 17:57:20 -0600
> Ryan Hill <dirtyepic@gentoo.org> wrote:

> > On Wed, 30 Jan 2013 22:36:53 +0100
> > Michał Górny <mgorny@gentoo.org> wrote:

> > > Currently, epunt_cxx always succeeds. This results in some
> > > of the ebuilds keeping its use even though the C++ checks were removed
> > > upstream.
> > > 
> > > Therefore, I'm suggesting to add a simple check to the function -- if
> > > none of the patching attempts succeed, die requesting the user to remove
> > > the invocation.
> > 
> > eqawarn?
> 
> Yes, eqawarn if we don't want users to be hurt :P.

I think it would be overkill to make what is essentially a no-op into a fatal
error.  A warning would be appropriate.


-- 
gcc-porting
toolchain, wxwidgets            learn a language baby, it's that kind of place
@ gentoo.org                   where low card is hunger and high card is taste

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 490 bytes --]