Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] gcc: don't patch gcc if there are no patches to apply
@ 2013-11-11 14:36 Mischa Jonker
  2013-11-11 21:59 ` Peter Korsgaard
  0 siblings, 1 reply; 4+ messages in thread
From: Mischa Jonker @ 2013-11-11 14:36 UTC (permalink / raw)
  To: buildroot

While the generic package handler checks for a directory with patches
before starting apply-patches.sh, this is not the case for gcc: the
script is called, even if there is no directory with patches. This results
into a build failure, as apply-patches exits with error code 1 if the
directory doesn't exist.

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
---
 package/gcc/gcc.mk |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index 0c0cc99..41600ef 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -49,7 +49,9 @@ endif
 endif
 
 define HOST_GCC_APPLY_PATCHES
-	support/scripts/apply-patches.sh $(@D) package/gcc/$(GCC_VERSION) \*.patch
+	if test -d package/gcc/$(GCC_VERSION); then \
+	  support/scripts/apply-patches.sh $(@D) package/gcc/$(GCC_VERSION) \*.patch ; \
+	fi;
 	$(HOST_GCC_APPLY_POWERPC_PATCH)
 endef
 
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH] gcc: don't patch gcc if there are no patches to apply
  2013-11-11 14:36 [Buildroot] [PATCH] gcc: don't patch gcc if there are no patches to apply Mischa Jonker
@ 2013-11-11 21:59 ` Peter Korsgaard
  2013-11-11 22:04   ` Arnout Vandecappelle
  0 siblings, 1 reply; 4+ messages in thread
From: Peter Korsgaard @ 2013-11-11 21:59 UTC (permalink / raw)
  To: buildroot

>>>>> "Mischa" == Mischa Jonker <Mischa.Jonker@synopsys.com> writes:

> While the generic package handler checks for a directory with patches
> before starting apply-patches.sh, this is not the case for gcc: the
> script is called, even if there is no directory with patches. This results
> into a build failure, as apply-patches exits with error code 1 if the
> directory doesn't exist.

Arnout already posted another patch solving the same issue, but I prefer
this one for 2013.11 - So committed, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH] gcc: don't patch gcc if there are no patches to apply
  2013-11-11 21:59 ` Peter Korsgaard
@ 2013-11-11 22:04   ` Arnout Vandecappelle
  2013-11-11 22:21     ` Peter Korsgaard
  0 siblings, 1 reply; 4+ messages in thread
From: Arnout Vandecappelle @ 2013-11-11 22:04 UTC (permalink / raw)
  To: buildroot

On 11/11/13 22:59, Peter Korsgaard wrote:
>>>>>> "Mischa" == Mischa Jonker <Mischa.Jonker@synopsys.com> writes:
>
>> While the generic package handler checks for a directory with patches
>> before starting apply-patches.sh, this is not the case for gcc: the
>> script is called, even if there is no directory with patches. This results
>> into a build failure, as apply-patches exits with error code 1 if the
>> directory doesn't exist.
>
> Arnout already posted another patch solving the same issue, but I prefer
> this one for 2013.11 - So committed, thanks.

  Should I refresh my patch on top of this or do you want to drop my patch?

  Regards,
  Arnout


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH] gcc: don't patch gcc if there are no patches to apply
  2013-11-11 22:04   ` Arnout Vandecappelle
@ 2013-11-11 22:21     ` Peter Korsgaard
  0 siblings, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2013-11-11 22:21 UTC (permalink / raw)
  To: buildroot

>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:

> On 11/11/13 22:59, Peter Korsgaard wrote:
>>>>>>> "Mischa" == Mischa Jonker <Mischa.Jonker@synopsys.com> writes:
>> 
>>> While the generic package handler checks for a directory with patches
>>> before starting apply-patches.sh, this is not the case for gcc: the
>>> script is called, even if there is no directory with patches. This results
>>> into a build failure, as apply-patches exits with error code 1 if the
>>> directory doesn't exist.
>> 
>> Arnout already posted another patch solving the same issue, but I prefer
>> this one for 2013.11 - So committed, thanks.

>  Should I refresh my patch on top of this or do you want to drop my patch?

I think it's still a better aproach long term (especially if/when we get
out-of-tree support), so yes - Please do.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2013-11-11 22:21 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-11 14:36 [Buildroot] [PATCH] gcc: don't patch gcc if there are no patches to apply Mischa Jonker
2013-11-11 21:59 ` Peter Korsgaard
2013-11-11 22:04   ` Arnout Vandecappelle
2013-11-11 22:21     ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox