* [Buildroot] [git commit] package/gcc: use generic extract commands
@ 2015-11-03 21:22 Thomas Petazzoni
2015-11-04 5:17 ` Steven Noonan
0 siblings, 1 reply; 4+ messages in thread
From: Thomas Petazzoni @ 2015-11-03 21:22 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=e3b46be7f41d7d336636560b6b85fedfbc68cd89
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Reviewed-by: Romain Naour <romain.naour@openwide.fr>
Reviewed-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Tested-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/gcc/gcc-final/gcc-final.mk | 3 ++-
package/gcc/gcc-initial/gcc-initial.mk | 3 ++-
package/gcc/gcc.mk | 15 ++++-----------
3 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
index 5a0f5b5..8ac2968 100644
--- a/package/gcc/gcc-final/gcc-final.mk
+++ b/package/gcc/gcc-final/gcc-final.mk
@@ -12,7 +12,8 @@ HOST_GCC_FINAL_DEPENDENCIES = \
$(HOST_GCC_COMMON_DEPENDENCIES) \
$(BR_LIBC)
-HOST_GCC_FINAL_EXTRACT_CMDS = $(HOST_GCC_EXTRACT_CMDS)
+HOST_GCC_FINAL_TAR_EXCLUDES = $(HOST_GCC_TAR_EXCLUDES)
+HOST_GCC_FINAL_POST_EXTRACT_HOOKS += HOST_GCC_FAKE_TESTSUITE
ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),)
HOST_GCC_FINAL_POST_EXTRACT_HOOKS += HOST_GCC_XTENSA_OVERLAY_EXTRACT
diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk
index c0b5eaf..3ab47b9 100644
--- a/package/gcc/gcc-initial/gcc-initial.mk
+++ b/package/gcc/gcc-initial/gcc-initial.mk
@@ -10,7 +10,8 @@ GCC_INITIAL_SOURCE = $(GCC_SOURCE)
HOST_GCC_INITIAL_DEPENDENCIES = $(HOST_GCC_COMMON_DEPENDENCIES)
-HOST_GCC_INITIAL_EXTRACT_CMDS = $(HOST_GCC_EXTRACT_CMDS)
+HOST_GCC_INITIAL_TAR_EXCLUDES = $(HOST_GCC_TAR_EXCLUDES)
+HOST_GCC_INITIAL_POST_EXTRACT_HOOKS += HOST_GCC_FAKE_TESTSUITE
ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),)
HOST_GCC_INITIAL_POST_EXTRACT_HOOKS += HOST_GCC_XTENSA_OVERLAY_EXTRACT
diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index d6213cc..28eb75e 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -48,18 +48,11 @@ define HOST_GCC_APPLY_PATCHES
$(HOST_GCC_APPLY_POWERPC_PATCH)
endef
-#
-# Custom extract command to save disk space
-#
+HOST_GCC_TAR_EXCLUDES = \
+ libjava/* libgo/* \
+ gcc/testsuite/* libstdc++-v3/testsuite/*
-define HOST_GCC_EXTRACT_CMDS
- $(call suitable-extractor,$(GCC_SOURCE)) $(DL_DIR)/$(GCC_SOURCE) | \
- $(TAR) --strip-components=1 -C $(@D) \
- --exclude='libjava/*' \
- --exclude='libgo/*' \
- --exclude='gcc/testsuite/*' \
- --exclude='libstdc++-v3/testsuite/*' \
- $(TAR_OPTIONS) -
+define HOST_GCC_FAKE_TESTSUITE
mkdir -p $(@D)/libstdc++-v3/testsuite/
echo "all:" > $(@D)/libstdc++-v3/testsuite/Makefile.in
echo "install:" >> $(@D)/libstdc++-v3/testsuite/Makefile.in
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [git commit] package/gcc: use generic extract commands
2015-11-03 21:22 [Buildroot] [git commit] package/gcc: use generic extract commands Thomas Petazzoni
@ 2015-11-04 5:17 ` Steven Noonan
2015-11-04 7:34 ` Thomas Petazzoni
0 siblings, 1 reply; 4+ messages in thread
From: Steven Noonan @ 2015-11-04 5:17 UTC (permalink / raw)
To: buildroot
Hi everyone. Long time, no see...
On Tue, Nov 3, 2015 at 1:22 PM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> commit: http://git.buildroot.net/buildroot/commit/?id=e3b46be7f41d7d336636560b6b85fedfbc68cd89
> branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> Reviewed-by: Romain Naour <romain.naour@openwide.fr>
> Reviewed-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> Tested-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
> package/gcc/gcc-final/gcc-final.mk | 3 ++-
> package/gcc/gcc-initial/gcc-initial.mk | 3 ++-
> package/gcc/gcc.mk | 15 ++++-----------
> 3 files changed, 8 insertions(+), 13 deletions(-)
>
> diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
> index 5a0f5b5..8ac2968 100644
> --- a/package/gcc/gcc-final/gcc-final.mk
> +++ b/package/gcc/gcc-final/gcc-final.mk
> @@ -12,7 +12,8 @@ HOST_GCC_FINAL_DEPENDENCIES = \
> $(HOST_GCC_COMMON_DEPENDENCIES) \
> $(BR_LIBC)
>
> -HOST_GCC_FINAL_EXTRACT_CMDS = $(HOST_GCC_EXTRACT_CMDS)
> +HOST_GCC_FINAL_TAR_EXCLUDES = $(HOST_GCC_TAR_EXCLUDES)
This appears to be wrong. The variable used in pkg-generic.mk is
$(2)_EXCLUDES not $(2)_TAR_EXCLUDES. So this doesn't pass any
'--exclude's to the tar command.
> +HOST_GCC_FINAL_POST_EXTRACT_HOOKS += HOST_GCC_FAKE_TESTSUITE
>
> ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),)
> HOST_GCC_FINAL_POST_EXTRACT_HOOKS += HOST_GCC_XTENSA_OVERLAY_EXTRACT
> diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk
> index c0b5eaf..3ab47b9 100644
> --- a/package/gcc/gcc-initial/gcc-initial.mk
> +++ b/package/gcc/gcc-initial/gcc-initial.mk
> @@ -10,7 +10,8 @@ GCC_INITIAL_SOURCE = $(GCC_SOURCE)
>
> HOST_GCC_INITIAL_DEPENDENCIES = $(HOST_GCC_COMMON_DEPENDENCIES)
>
> -HOST_GCC_INITIAL_EXTRACT_CMDS = $(HOST_GCC_EXTRACT_CMDS)
> +HOST_GCC_INITIAL_TAR_EXCLUDES = $(HOST_GCC_TAR_EXCLUDES)
Same.
> +HOST_GCC_INITIAL_POST_EXTRACT_HOOKS += HOST_GCC_FAKE_TESTSUITE
>
> ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),)
> HOST_GCC_INITIAL_POST_EXTRACT_HOOKS += HOST_GCC_XTENSA_OVERLAY_EXTRACT
> diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
> index d6213cc..28eb75e 100644
> --- a/package/gcc/gcc.mk
> +++ b/package/gcc/gcc.mk
> @@ -48,18 +48,11 @@ define HOST_GCC_APPLY_PATCHES
> $(HOST_GCC_APPLY_POWERPC_PATCH)
> endef
>
> -#
> -# Custom extract command to save disk space
> -#
> +HOST_GCC_TAR_EXCLUDES = \
> + libjava/* libgo/* \
> + gcc/testsuite/* libstdc++-v3/testsuite/*
>
> -define HOST_GCC_EXTRACT_CMDS
> - $(call suitable-extractor,$(GCC_SOURCE)) $(DL_DIR)/$(GCC_SOURCE) | \
> - $(TAR) --strip-components=1 -C $(@D) \
> - --exclude='libjava/*' \
> - --exclude='libgo/*' \
> - --exclude='gcc/testsuite/*' \
> - --exclude='libstdc++-v3/testsuite/*' \
> - $(TAR_OPTIONS) -
> +define HOST_GCC_FAKE_TESTSUITE
> mkdir -p $(@D)/libstdc++-v3/testsuite/
> echo "all:" > $(@D)/libstdc++-v3/testsuite/Makefile.in
> echo "install:" >> $(@D)/libstdc++-v3/testsuite/Makefile.in
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [git commit] package/gcc: use generic extract commands
2015-11-04 5:17 ` Steven Noonan
@ 2015-11-04 7:34 ` Thomas Petazzoni
2015-11-04 7:37 ` Steven Noonan
0 siblings, 1 reply; 4+ messages in thread
From: Thomas Petazzoni @ 2015-11-04 7:34 UTC (permalink / raw)
To: buildroot
Dear Steven Noonan,
On Tue, 3 Nov 2015 21:17:36 -0800, Steven Noonan wrote:
> > -HOST_GCC_FINAL_EXTRACT_CMDS = $(HOST_GCC_EXTRACT_CMDS)
> > +HOST_GCC_FINAL_TAR_EXCLUDES = $(HOST_GCC_TAR_EXCLUDES)
>
> This appears to be wrong. The variable used in pkg-generic.mk is
> $(2)_EXCLUDES not $(2)_TAR_EXCLUDES. So this doesn't pass any
> '--exclude's to the tar command.
Indeed. Fixed by
http://git.buildroot.net/buildroot/commit/?id=4a8478b728429e94e0c85330e1558298d905af3e.
Thanks for having reported the issue!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [git commit] package/gcc: use generic extract commands
2015-11-04 7:34 ` Thomas Petazzoni
@ 2015-11-04 7:37 ` Steven Noonan
0 siblings, 0 replies; 4+ messages in thread
From: Steven Noonan @ 2015-11-04 7:37 UTC (permalink / raw)
To: buildroot
Oops, my patch was late then ;)
On Tue, Nov 3, 2015 at 11:34 PM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Dear Steven Noonan,
>
> On Tue, 3 Nov 2015 21:17:36 -0800, Steven Noonan wrote:
>
>> > -HOST_GCC_FINAL_EXTRACT_CMDS = $(HOST_GCC_EXTRACT_CMDS)
>> > +HOST_GCC_FINAL_TAR_EXCLUDES = $(HOST_GCC_TAR_EXCLUDES)
>>
>> This appears to be wrong. The variable used in pkg-generic.mk is
>> $(2)_EXCLUDES not $(2)_TAR_EXCLUDES. So this doesn't pass any
>> '--exclude's to the tar command.
>
> Indeed. Fixed by
> http://git.buildroot.net/buildroot/commit/?id=4a8478b728429e94e0c85330e1558298d905af3e.
> Thanks for having reported the issue!
>
> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-11-04 7:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-03 21:22 [Buildroot] [git commit] package/gcc: use generic extract commands Thomas Petazzoni
2015-11-04 5:17 ` Steven Noonan
2015-11-04 7:34 ` Thomas Petazzoni
2015-11-04 7:37 ` Steven Noonan
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.