[Buildroot] [PATCH] host-gcc: apply patches stored in global patches directories

He Chunhui hchunhui at mail.ustc.edu.cn
Mon Apr 11 03:01:15 UTC 2016


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

Signed-off-by: He Chunhui <hchunhui at mail.ustc.edu.cn>
---
 package/gcc/gcc.mk | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index 5646b66..de9a65c 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -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,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR)))/$(GCC_VERSION) \
+	    $(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
 
-- 
2.1.4




More information about the buildroot mailing list