Dependencies are now handled with --nobuild unless specificially skipped. Using --verifysource will skip dependency checks unless --syncdeps is specified. Fixes FS#35057 Signed-off-by: Allan McRae --- This time with documentation updates. doc/makepkg.8.txt | 4 +++- scripts/makepkg.sh.in | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 0277f54..16bdc8a 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -63,7 +63,9 @@ Options *\--verifysource*:: For each source file in the source array of PKGBUILD, download the file if required and perform the integrity checks. No extraction or build is - performed. Useful for performing subsequent offline builds. + performed. Dependencies specified in the PKGBUILD will not be handled + unless `--syndeps` is used. Useful for performing subsequent offline + builds. *-f, \--force*:: makepkg will not build a package if a built package already exists in diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 94dd98a..917bc2c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2448,7 +2448,7 @@ check_vcs_software() { local uninstalled uninstalled="$(set +E; check_deps $client)" || exit 1 # if not installed, check presence in depends or makedepends - if [[ -n "$uninstalled" ]] && (( ! NODEPS )); then + if [[ -n "$uninstalled" ]] && (( ! NODEPS || ( VERIFYSOURCE && !DEP_BIN ) )); then if ! in_array "$client" "${depends[@]} ${makedepends}"; then error "$(gettext "Cannot find the %s package needed to handle %s sources.")" \ "$client" "${proto%%+*}" @@ -3125,7 +3125,7 @@ if (( SOURCEONLY )); then exit 0 fi -if (( NODEPS || (NOBUILD && !DEP_BIN ) )); then +if (( NODEPS || ( VERIFYSOURCE && !DEP_BIN ) )); then # no warning message needed for nobuild if (( NODEPS )); then warning "$(gettext "Skipping dependency checks.")" -- 2.0.1