Skip to contentSkip to conversation

gcc: don't patch gcc if there are no patches to apply

PATCH New Mischa Jonker 3 participants 4 messages Nov 11, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gcc: don't patch gcc if there are no patches to apply

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.

---
 package/gcc/gcc.mk |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/gcc/gcc.mk +3 -1
index 0c0cc99..41600ef 100644
@@ -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
 
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 gcc: don't patch gcc if there are no patches to apply

Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Mischa" == Mischa Jonker <[email protected]> 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.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 gcc: don't patch gcc if there are no patches to apply

Quoted 10 lines · Peter Korsgaard
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Mischa" == Mischa Jonker <[email protected]> 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

Signature · 6 lines
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
#3 lore raw

PATCH 1/1 gcc: don't patch gcc if there are no patches to apply

Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Arnout" == Arnout Vandecappelle <[email protected]> writes:

Quoted 8 lines · Peter Korsgaard
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Mischa" == Mischa Jonker <[email protected]> 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.

Quoted 4 lines
Quoted 2 lines

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.

Signature · 1 line
Bye, Peter Korsgaard