moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

xbps-src: move ccache/distcc to hostdir, to make them shared by multiple masterdirs.

Browse source 
This way a single ccache or distcc directory can be shared by multiple
independent masterdirs.
This commit is contained in:
Juan RP 2014-10-26 10:22:30 +01:00
parent 77642dc2e9
commit 58bbb98712
3 changed files with 10 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/xbps-src/shutils/chroot.sh
View file

@ -30,8 +30,8 @@ XBPS_SRC_VERSION="$XBPS_SRC_VERSION"
PATH=/void-packages:/usr/bin:/usr/sbin PATH=/void-packages:/usr/bin:/usr/sbin
exec env -i PATH="\$PATH" DISTCC_HOSTS="\$XBPS_DISTCC_HOSTS" DISTCC_DIR="/distcc" @@XARCH@@ \ exec env -i PATH="\$PATH" DISTCC_HOSTS="\$XBPS_DISTCC_HOSTS" DISTCC_DIR="/host/distcc" @@XARCH@@ \
CCACHE_DIR="/ccache" IN_CHROOT=1 LANG=en_US.UTF-8 TERM=linux HOME="/tmp" \ CCACHE_DIR="/host/ccache" IN_CHROOT=1 LANG=en_US.UTF-8 TERM=linux HOME="/tmp" \
PS1="[\u@$XBPS_MASTERDIR \W]$ " /bin/bash +h PS1="[\u@$XBPS_MASTERDIR \W]$ " /bin/bash +h
_EOF _EOF
if [ -n "$XBPS_ARCH" ]; then if [ -n "$XBPS_ARCH" ]; then

6
etc/defaults.conf
View file

@ -40,12 +40,14 @@ XBPS_LDFLAGS="-Wl,--as-needed"
XBPS_SUCMD="sudo /bin/sh -c" XBPS_SUCMD="sudo /bin/sh -c"
# [OPTIONAL] # [OPTIONAL]
# Enable or disable ccache when building packages. # Enable or disable ccache when building packages. The ccache directory
# is stored in the hostdir, i.e hostdir/ccache.
# #
#XBPS_CCACHE=yes #XBPS_CCACHE=yes
# [OPTIONAL] # [OPTIONAL]
# Enable or disable distcc when building packages. # Enable or disable distcc when building packages. The distcc directory
# is stored in the hostdir, i.e hostdir/distcc.
# #
#XBPS_DISTCC=yes #XBPS_DISTCC=yes
#XBPS_DISTCC_HOSTS="" #XBPS_DISTCC_HOSTS=""

20
xbps-src
View file

@ -485,28 +485,16 @@ else
export PATH="$MYPATH" export PATH="$MYPATH"
if [ -n "$XBPS_CCACHE" ]; then if [ -n "$XBPS_CCACHE" ]; then
CCACHEPATH="/usr/lib/ccache/bin" CCACHEPATH="/usr/lib/ccache/bin"
if [ -n "$XBPS_HOSTDIR" -a -d "$XBPS_HOSTDIR/ccache" ]; then export CCACHE_DIR="$XBPS_HOSTDIR/ccache"
export CCACHE_DIR="$XBPS_HOSTDIR/ccache"
else
if [ ! -d "$XBPS_MASTERDIR/ccache" ]; then
mkdir -p $XBPS_MASTERDIR/ccache
fi
export CCACHE_DIR="$XBPS_MASTERDIR/ccache"
fi
export PATH="$CCACHEPATH:$PATH" export PATH="$CCACHEPATH:$PATH"
mkdir -p $CCACHE_DIR
fi fi
if [ -n "$XBPS_DISTCC" ]; then if [ -n "$XBPS_DISTCC" ]; then
DISTCCPATH="/usr/lib/distcc/bin" DISTCCPATH="/usr/lib/distcc/bin"
if [ -n "$XBPS_HOSTDIR" -a -d "$XBPS_HOSTDIR/distcc" ]; then export DISTCC_DIR="$XBPS_HOSTDIR/distcc"
export DISTCC_DIR="$XBPS_HOSTDIR/distcc"
else
if [ ! -d "$XBPS_MASTERDIR/distcc" ]; then
mkdir -p $XBPS_MASTERDIR/distcc
fi
export DISTCC_DIR="$XBPS_MASTERDIR/distcc"
fi
export DISTCC_HOSTS="$XBPS_DISTCC_HOSTS" export DISTCC_HOSTS="$XBPS_DISTCC_HOSTS"
export PATH="$DISTCCPATH:$PATH" export PATH="$DISTCCPATH:$PATH"
mkdir -p $DISTCC_DIR
fi fi
fi fi