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

makepkg: merge arch dependent variables after PKGBUILD linting

Browse source 
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2015-11-13 13:33:23 +10:00
parent ef1fb0ef81
commit 663c74150a
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scripts/makepkg.sh.in
View file

@ -761,10 +761,6 @@ merge_arch_attrs() {
source_buildfile() { source_buildfile() {
source_safe "$@" source_safe "$@"
if (( !SOURCEONLY )); then
merge_arch_attrs
fi
} }
run_function_safe() { run_function_safe() {
@ -2004,8 +2000,15 @@ else
source_buildfile "$BUILDFILE" source_buildfile "$BUILDFILE"
fi fi
# set defaults if they weren't specified in buildfile
pkgbase=${pkgbase:-${pkgname[0]}} pkgbase=${pkgbase:-${pkgname[0]}}
# check the PKGBUILD for some basic requirements
lint_pkgbuild || exit 1
if (( !SOURCEONLY )); then
merge_arch_attrs
fi
basever=$(get_full_version) basever=$(get_full_version)
if [[ $BUILDDIR = "$startdir" ]]; then if [[ $BUILDDIR = "$startdir" ]]; then
@ -2033,9 +2036,6 @@ if have_function pkgver; then
PKGVERFUNC=1 PKGVERFUNC=1
fi fi
# check the PKGBUILD for some basic requirements
lint_pkgbuild || exit 1
# check we have the software required to process the PKGBUILD # check we have the software required to process the PKGBUILD
check_software || exit 1 check_software || exit 1