diff options
| -rwxr-xr-x | pbuilder-buildpackage | 11 | ||||
| -rw-r--r-- | pbuilder-buildpackage-funcs | 13 |
2 files changed, 14 insertions, 10 deletions
diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage index 91b8659..b8e2446 100755 --- a/pbuilder-buildpackage +++ b/pbuilder-buildpackage @@ -86,16 +86,7 @@ fi recover_aptcache createbuilduser -if [ -n "$CCACHEDIR" ]; then - log "I: Setting up ccache" - if ! [ -d "$BUILDPLACE/$CCACHEDIR" ]; then - mkdir -p "$BUILDPLACE/$CCACHEDIR" - fi - chown -R $BUILDUSERID:$BUILDUSERID "$BUILDPLACE/$CCACHEDIR" - # Unfortunate difference between pbuilder-style and ccache-style config env - # vars :-/ - export CCACHE_DIR="$CCACHEDIR" -fi +setup_ccache log "I: Installing the build-deps" executehooks "D" trap saveaptcache_umountproc_cleanbuildplace_trap exit sighup sigpipe diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs index 023dbca..39f1e71 100644 --- a/pbuilder-buildpackage-funcs +++ b/pbuilder-buildpackage-funcs @@ -104,3 +104,16 @@ function createbuilduser () { unset LOGNAME || true fi } + +function setup_ccache() { + if [ -n "$CCACHEDIR" ]; then + log "I: Setting up ccache" + if ! [ -d "$BUILDPLACE/$CCACHEDIR" ]; then + mkdir -p "$BUILDPLACE/$CCACHEDIR" + fi + chown -R $BUILDUSERID:$BUILDUSERID "$BUILDPLACE/$CCACHEDIR" + # Unfortunate difference between pbuilder-style and ccache-style config + # env vars :-/ + export CCACHE_DIR="$CCACHEDIR" + fi +} |