xbps-src: set wrksrc to $pkgname-$version unconditionally

This commit is contained in:
Đoàn Trần Công Danh 2021-09-19 17:55:50 +07:00 committed by Đoàn Trần Công Danh
parent af9931fd3b
commit 8c5358f792
3 changed files with 2 additions and 9 deletions

View File

@ -512,8 +512,7 @@ can be specified by prepending a commercial at (@).
For tarballs you can find the contents checksum by using the command For tarballs you can find the contents checksum by using the command
`tar xf <tarball.ext> --to-stdout | sha256sum`. `tar xf <tarball.ext> --to-stdout | sha256sum`.
- `wrksrc` The directory name where the package sources are extracted, by default - `wrksrc` The directory name where the package sources are extracted, set to `${pkgname}-${version}`.
set to `${pkgname}-${version}`. If the top level directory of a package's `distfile` is different from the default, `wrksrc` must be set to the top level directory name inside the archive.
- `build_wrksrc` A directory relative to `${wrksrc}` that will be used when building the package. - `build_wrksrc` A directory relative to `${wrksrc}` that will be used when building the package.

View File

@ -5,7 +5,6 @@
# required variables # required variables
# #
# build_style=slashpackage # build_style=slashpackage
# wrksrc=<category>
# build_wrksrc=${pkgname}-${version} # build_wrksrc=${pkgname}-${version}
# distfiles=<download link> # distfiles=<download link>
# #
@ -15,7 +14,6 @@
# pkgname=daemontools # pkgname=daemontools
# version=0.76 # version=0.76
# revision=1 # revision=1
# wrksrc=admin
# build_wrksrc=${pkgname}-${version} # build_wrksrc=${pkgname}-${version}
# build_style=slashpackage # build_style=slashpackage
# short_desc="A collection of tools for managing UNIX services" # short_desc="A collection of tools for managing UNIX services"

View File

@ -655,11 +655,7 @@ setup_pkg() {
fi fi
# Setup some specific package vars. # Setup some specific package vars.
if [ -z "$wrksrc" ]; then wrksrc="$XBPS_BUILDDIR/${sourcepkg}-${version}"
wrksrc="$XBPS_BUILDDIR/${sourcepkg}-${version}"
else
wrksrc="$XBPS_BUILDDIR/$wrksrc"
fi
if [ "$cross" -a "$nocross" ]; then if [ "$cross" -a "$nocross" ]; then
report_broken \ report_broken \