bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update 2 files

Browse source 
- /scripts/makepkg.sh.in
- /etc/makepkg.conf.in
This commit is contained in:
voskresenie 2024-10-20 01:06:35 +00:00
parent 0f6b4f4fab
commit 19f2bfe189
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
etc/makepkg.conf.in
View file

@ -69,8 +69,14 @@ BUILDENV=(!distcc color !ccache check !sign)
#-- specify a space-delimited list of hosts running in the DistCC cluster. #-- specify a space-delimited list of hosts running in the DistCC cluster.
#DISTCC_HOSTS="" #DISTCC_HOSTS=""
# #
#-- Specify a directory for package building. #-- Specify a directory for package building. Default: working directory
#BUILDDIR=/tmp/makepkg #BUILDDIR=/tmp/makepkg
#-- Specify a directory for package source code extracted during build.
#-- Default: src directory inside build directory
#BUILDSRCDIR=/tmp/makepkg/src
#-- Specify a directory for package files prior to archival and compression.
#-- Default: pkg directory inside build directory
#BUILDPKGDIR=/tmp/makepkg/pkg
######################################################################### #########################################################################
# GLOBAL PACKAGE OPTIONS # GLOBAL PACKAGE OPTIONS

10
scripts/makepkg.sh.in
View file

@ -1163,9 +1163,17 @@ if [[ $BUILDDIR -ef "$startdir" ]]; then
srcdir="$BUILDDIR/src" srcdir="$BUILDDIR/src"
pkgdirbase="$BUILDDIR/pkg" pkgdirbase="$BUILDDIR/pkg"
else else
if [[ -n "$BUILDSRCDIR" ]]; then
srcdir="$BUILDSRCDIR/$pkgbase"
else
srcdir="$BUILDDIR/$pkgbase/src" srcdir="$BUILDDIR/$pkgbase/src"
pkgdirbase="$BUILDDIR/$pkgbase/pkg" fi
if [[ -n "$BUILDPKGDIR" ]]; then
pkgdirbase="$BUILDPKGDIR/$pkgbase"
else
pkgdirbase="$BUILDDIR/$pkgbase/pkg"
fi
fi fi
# set pkgdir to something "sensible" for (not recommended) use during build() # set pkgdir to something "sensible" for (not recommended) use during build()