summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2018-03-07 09:17:33 +0000
committerMathieu Arnold <mat@FreeBSD.org>2018-03-07 09:17:33 +0000
commit3754818b7650ed8d19216a5a81c253de13ecfbaf (patch)
tree959304ab82b1ddd93da6efee7a4b625a354696f3
parentaudio/padthv1-lv2: Update to 0.9.0 (diff)
Handle flavors in the proxydeps qa check.
Reviewed by: bdrewery Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D14595
Notes
Notes: svn path=/head/; revision=463782
-rw-r--r--Mk/Scripts/qa.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/Mk/Scripts/qa.sh b/Mk/Scripts/qa.sh
index d3847a7b1320..bf2b1fd6e715 100644
--- a/Mk/Scripts/qa.sh
+++ b/Mk/Scripts/qa.sh
@@ -669,6 +669,13 @@ proxydeps() {
# If we don't already depend on it, and we don't provide it
if ! listcontains ${dep_file_pkg} "${LIB_RUN_DEPENDS} ${PKGORIGIN}"; then
+ # If the package has a flavor, check that the dependency is not on that particular flavor.
+ flavor=$(pkg annotate -q -S "${dep_file_pkg}" flavor)
+ if [ -n "${flavor}" ]; then
+ if listcontains ${dep_file_pkg}@${flavor} "${LIB_RUN_DEPENDS} ${PKGORIGIN}"; then
+ continue
+ fi
+ fi
err "${file} is linked to ${dep_file} from ${dep_file_pkg} but it is not declared as a dependency"
proxydeps_suggest_uses ${dep_file_pkg} ${dep_file}
rc=1