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

xbps-src: added XBPS_CCACHE option to xbps-src.conf.

Browse source 
If set /usr/lib/ccache/bin will be added to PATH as the first entry,
*only* for chroot.
This commit is contained in:
Juan RP 2011-07-02 09:15:29 +02:00
parent 5c55f940ae
commit cbdfc216de
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
xbps-src/etc/xbps-src.conf.in
View file

@ -21,11 +21,16 @@ XBPS_MASTERDIR=$XBPS_DISTRIBUTIONDIR/masterdir
#XBPS_CACHEDIR=/path/to/cachedir/with/user/permissions/to/write #XBPS_CACHEDIR=/path/to/cachedir/with/user/permissions/to/write
# #
# Compilation flags for cc and c++. # Compilation flags for C and C++.
# #
XBPS_CFLAGS="-O2 -pipe" XBPS_CFLAGS="-O2 -pipe"
XBPS_CXXFLAGS="$XBPS_CFLAGS" XBPS_CXXFLAGS="$XBPS_CFLAGS"
#
# Enable or disable ccache to build packages from source.
#
#XBPS_CCACHE=yes
# #
# Linker flags passed to the compiler. By default we use --as-needed to # Linker flags passed to the compiler. By default we use --as-needed to
# avoid linking extra libraries into binaries. See the following link # avoid linking extra libraries into binaries. See the following link

5
xbps-src/xbps-src.sh.in
View file

@ -249,8 +249,11 @@ if [ -z "$in_chroot" ]; then
MYPATH="$XBPS_MASTERDIR/usr/local/bin:$MYPATH" MYPATH="$XBPS_MASTERDIR/usr/local/bin:$MYPATH"
MYPATH="$XBPS_MASTERDIR/usr/local/sbin:$MYPATH" MYPATH="$XBPS_MASTERDIR/usr/local/sbin:$MYPATH"
else else
if [ -n "$XBPS_CCACHE" ]; then
CCACHEPATH="/usr/lib/ccache/bin"
fi
# In chroot always prefer tools from bootstrap. # In chroot always prefer tools from bootstrap.
MYPATH="/usr/lib/ccache/bin:/tools/bin:/usr/local/sbin:/usr/local/bin" MYPATH="$CCACHEPATH:/tools/bin:/usr/local/sbin:/usr/local/bin"
MYPATH="$MYPATH:/bin:/sbin:/usr/bin:/usr/sbin" MYPATH="$MYPATH:/bin:/sbin:/usr/bin:/usr/sbin"
fi fi
export PATH="$MYPATH" export PATH="$MYPATH"