From e3b46be7f41d7d336636560b6b85fedfbc68cd89 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 24 Oct 2015 14:48:55 +0200 Subject: [PATCH] package/gcc: use generic extract commands Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Vicente Olivert Riera Reviewed-by: Romain Naour Reviewed-by: Vicente Olivert Riera Tested-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- 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 5a0f5b5b8e..8ac296877b 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 c0b5eaff5e..3ab47b9da0 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 d6213ccf80..28eb75e0a8 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 -- 2.30.2