[arch-projects] [devtools] [PATCH] add ccache support

[Dominik Heidler]

Signed-off-by: Dominik Heidler <dheid...@gmail.com>
---
 makechrootpkg.in | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/makechrootpkg.in b/makechrootpkg.in
index d7d3ecf..d4c6abe 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -21,6 +21,8 @@ run_namcap=false
 temp_chroot=false
 chrootdir=
 passeddir=
+ccachedir=
+passedccdir=
 declare -a install_pkgs
 declare -i ret=0
 
@@ -58,10 +60,11 @@ usage() {
        echo "           Default: $copy"
        echo '-n         Run namcap on the package'
        echo '-T         Build in a temporary directory'
+       echo '-C <dir>   The ccache directory to use'
        exit 1
 }
 
-while getopts 'hcur:I:l:nT' arg; do
+while getopts 'hcur:I:l:C:nT' arg; do
        case "$arg" in
                h) usage ;;
                c) clean_first=true ;;
@@ -71,6 +74,7 @@ while getopts 'hcur:I:l:nT' arg; do
                l) copy="$OPTARG" ;;
                n) run_namcap=true; makepkg_args="$makepkg_args -i" ;;
                T) temp_chroot=true; copy+="-$$" ;;
+               C) passedccdir="$OPTARG" ;;
                *) makepkg_args="$makepkg_args -$arg $OPTARG" ;;
        esac
 done
@@ -84,6 +88,12 @@ chrootdir=$(readlink -e "$passeddir")
 [[ ! -d $chrootdir ]] && die "No chroot dir defined, or invalid path 
'$passeddir'"
 [[ ! -d $chrootdir/root ]] && die "Missing chroot dir root directory. Try 
using: mkarchroot $chrootdir/root base-devel"
 
+# Canonicalize ccachedir, getting rid of trailing /
+if [[ "$passedccdir" != "" ]]; then
+       ccachedir=$(readlink -e "$passedccdir")
+       [[ ! -d $ccachedir ]] && die "Invalid path '$passedccdir' given for 
ccache directory"
+fi
+
 # Detect chrootdir filesystem type
 chroottype=$(stat -f -c %T "$chrootdir")
 
@@ -349,6 +359,7 @@ download_sources
 if arch-nspawn "$copydir" \
        --bind-ro="$PWD:/startdir_host" \
        --bind-ro="$SRCDEST:/srcdest_host" \
+       ${ccachedir:+"--bind=$ccachedir:/build/.ccache"} \
        /chrootbuild
 then
        move_products
-- 
1.8.3.4