[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4e54a8e2d6d4286f85a38a492d34452092404b24

[Michael Tremer <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 2114 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  4e54a8e2d6d4286f85a38a492d34452092404b24 (commit)
      from  992fdd3d075b995e704b55b8bc66f44c5ad6aecf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4e54a8e2d6d4286f85a38a492d34452092404b24
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue May 28 12:01:30 2019 +0100

    ccache: Automatically set size to 8GB
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 lfs/ccache | 3 ---
 make.sh    | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/lfs/ccache b/lfs/ccache
index 22e71a12d..94d7bd149 100644
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -40,9 +40,6 @@ ifeq "$(PASS)" "1"
 	CFLAGS := $(patsubst -mfunction-return=%,,$(CFLAGS))
 endif
 
-# Set max cache size to 5GB
-CFLAGS += -DDEFAULT_MAXSIZE=5242880
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################
diff --git a/make.sh b/make.sh
index 2d871a2cb..30b42bbdb 100755
--- a/make.sh
+++ b/make.sh
@@ -520,6 +520,9 @@ prepareenv() {
 		SYSTEM_RELEASE="${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS"
 		;;
 	esac
+
+	# Setup ccache cache size
+	enterchroot ccache --max-size="${CCACHE_CACHE_SIZE}" >/dev/null
 }
 
 enterchroot() {
@@ -900,6 +903,7 @@ update_contributors() {
 }
 
 # Default settings
+CCACHE_CACHE_SIZE="8G"
 ENABLE_RAMDISK="auto"
 
 # Load configuration file


hooks/post-receive
--
IPFire 2.x development tree