From: Arnout Vandecappelle <arnout@mind.be>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v3 2/2] gcc: apply patches stored in global patches directories
Date: Wed, 13 Apr 2016 09:42:14 +0200 [thread overview]
Message-ID: <570DF856.6090502@mind.be> (raw)
In-Reply-To: <1460521232-28778-3-git-send-email-hchunhui@mail.ustc.edu.cn>
On 04/13/16 06:20, Chunhui He wrote:
> When building host gcc, patches stored in global patches directories
> are skipped.
> This patch fixes the unexpected behavior.
>
> Signed-off-by: Chunhui He <hchunhui@mail.ustc.edu.cn>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Regards,
Arnout
> ---
> package/gcc/gcc.mk | 15 ++++++++++++---
> 1 file changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
> index 46f05ff..4cadca7 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/$(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
>
> @@ -235,9 +241,12 @@ ifeq ($(BR2_CCACHE),y)
> HOST_GCC_COMMON_CCACHE_HASH_FILES += $(DL_DIR)/$(GCC_SOURCE)
> # Cfr. PATCH_BASE_DIRS in .stamp_patched, but we catch both versioned and
> # unversioned patches unconditionally
> +# Also catch patches in $(BR2_GLOBAL_PATCH_DIR)/gcc.
> HOST_GCC_COMMON_CCACHE_HASH_FILES += \
> $(sort $(wildcard \
> package/gcc/$(GCC_VERSION)/*.patch \
> + $(addsuffix /gcc/$(GCC_VERSION)/*.patch,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))) \
> + $(addsuffix /gcc/*.patch,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))) \
> $(addsuffix /$((PKG)_RAWNAME)/$(GCC_VERSION)/*.patch,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))) \
> $(addsuffix /$((PKG)_RAWNAME)/*.patch,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR)))))
> ifeq ($(BR2_xtensa),y)
>
--
Arnout Vandecappelle arnout dot vandecappelle at essensium dot com
Senior Embedded Software Architect . . . . . . +32-478-010353 (mobile)
Essensium, Mind division . . . . . . . . . . . . . . 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
next prev parent reply other threads:[~2016-04-13 7:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-13 4:20 [Buildroot] [PATCH v3 0/2] gcc: apply patches stored in global patches directories Chunhui He
2016-04-13 4:20 ` [Buildroot] [PATCH v3 1/2] gcc: fix ccache hash of patches in BR2_GLOBAL_PATCH_DIR Chunhui He
2016-04-18 21:06 ` Thomas Petazzoni
2016-04-13 4:20 ` [Buildroot] [PATCH v3 2/2] gcc: apply patches stored in global patches directories Chunhui He
2016-04-13 7:42 ` Arnout Vandecappelle [this message]
2016-07-03 13:53 ` Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=570DF856.6090502@mind.be \
--to=arnout@mind.be \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.