jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

xbps-src: Always enable the gocache

Browse source 
[ci_skip]
This commit is contained in:
Michael Aldridge 2018-08-30 21:30:44 -07:00
parent 0557336e29
commit a4dd50388a
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/environment/build-style/go.sh
View file

@ -17,3 +17,4 @@ export CGO_CPPFLAGS="$CPPFLAGS"
export CGO_CXXFLAGS="$CXXFLAGS" export CGO_CXXFLAGS="$CXXFLAGS"
export CGO_LDFLAGS="$LDFLAGS" export CGO_LDFLAGS="$LDFLAGS"
export CGO_ENABLED=1 export CGO_ENABLED=1
export GOCACHE="${XBPS_HOSTDIR}/gocache"

1
common/xbps-src/shutils/pkgtarget.sh
View file

@ -63,6 +63,7 @@ remove_pkg_autodeps() {
remove_pkg_wrksrc() { remove_pkg_wrksrc() {
if [ -d "$wrksrc" ]; then if [ -d "$wrksrc" ]; then
msg_normal "$pkgver: cleaning build directory...\n" msg_normal "$pkgver: cleaning build directory...\n"
chmod -R +wX $wrksrc # Needed to delete Go Modules
rm -rf $wrksrc rm -rf $wrksrc
fi fi
} }

5
xbps-src
View file

@ -621,10 +621,6 @@ else
export CCACHE_COMPILERCHECK=content CCACHE_COMPRESS=1 export CCACHE_COMPILERCHECK=content CCACHE_COMPRESS=1
export PATH="$CCACHEPATH:$PATH" export PATH="$CCACHEPATH:$PATH"
mkdir -p $CCACHE_DIR mkdir -p $CCACHE_DIR
export GOCACHE="${XBPS_HOSTDIR}/gocache"
else
export GOCACHE=off
fi fi
if [ -n "$XBPS_DISTCC" ]; then if [ -n "$XBPS_DISTCC" ]; then
if [ -n "$XBPS_CCACHE" ]; then if [ -n "$XBPS_CCACHE" ]; then
@ -688,6 +684,7 @@ case "$XBPS_TARGET" in
remove_pkg_autodeps remove_pkg_autodeps
fi fi
msg_normal "xbps-src: cleaning up masterdir...\n" msg_normal "xbps-src: cleaning up masterdir...\n"
chmod -R +wX $XBPS_MASTERDIR/builddir # Needed to remove Go Modules
rm -rf $XBPS_MASTERDIR/builddir $XBPS_MASTERDIR/destdir rm -rf $XBPS_MASTERDIR/builddir $XBPS_MASTERDIR/destdir
rm -f $XBPS_MASTERDIR/tmp/* >/dev/null 2>&1 rm -f $XBPS_MASTERDIR/tmp/* >/dev/null 2>&1
else else