Skip to contentSkip to conversation

host-gcc: apply patches stored in global patches directories

PATCH Superseded He Chunhui 2 participants 2 messages Apr 12, 2016

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

He Chunhui

author
#0 lore raw

PATCH v2 1/1 host-gcc: apply patches stored in global patches directories

When building host gcc, patches stored in global patches directories are skipped. This patch fixes the unexpected behavior.

Signed-off-by He Chunhui <[email protected]>
---
 package/gcc/gcc.mk | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
package/gcc/gcc.mk +9 -3
index 5646b66..c7862a5 100644
@@ -42,9 +42,15 @@ endif
 endif
 
 define HOST_GCC_APPLY_PATCHES
-	if test -d package/gcc/$(GCC_VERSION); then \
-	  $(APPLY_PATCHES) $(@D) package/gcc/$(GCC_VERSION) \*.patch ; \
-	fi;
+	for D in \
+	    package/gcc/$(GCC_VERSION) \
+	    $(addsuffix /gcc/$(GCC_VERSION),$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))) \
+	    $(addsuffix /gcc,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))) \
+	    ; do \
+	  if test -d $${D}; then \
+	    $(APPLY_PATCHES) $(@D) $${D} \*.patch || exit 1; \
+	  fi; \
+	done;
 	$(HOST_GCC_APPLY_POWERPC_PATCH)
 endef
Signature · 1 line
2.1.4
#1 lore raw

PATCH v2 1/1 host-gcc: apply patches stored in global patches directories

Quoted 1 line · He Chunhui

When building host gcc, patches stored in global patches directories are skipped.

I didn't notice this one earlier: commit log should be wrapped at 72 columns.

Quoted 4 lines

This patch fixes the unexpected behavior.

Signed-off-by He Chunhui <[email protected]>

---

Please include a patch changelog when you send a v2, i.e.:

Signed-off-by ...

---
v2: move the $(GCC_VERSION) part of the suffix to the correct place.

Regards,
Arnout

Quoted 27 lines
  package/gcc/gcc.mk | 12 +++++++++---
  1 file changed, 9 insertions(+), 3 deletions(-)
package/gcc/gcc.mk +9 -3
index 5646b66..c7862a5 100644
@@ -42,9 +42,15 @@ endif
  endif
 
  define HOST_GCC_APPLY_PATCHES
-	if test -d package/gcc/$(GCC_VERSION); then \
-	  $(APPLY_PATCHES) $(@D) package/gcc/$(GCC_VERSION) \*.patch ; \
-	fi;
+	for D in \
+	    package/gcc/$(GCC_VERSION) \
+	    $(addsuffix /gcc/$(GCC_VERSION),$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))) \
+	    $(addsuffix /gcc,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))) \
+	    ; do \
+	  if test -d $${D}; then \
+	    $(APPLY_PATCHES) $(@D) $${D} \*.patch || exit 1; \
+	  fi; \
+	done;
  	$(HOST_GCC_APPLY_POWERPC_PATCH)
  endef
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:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF