summaryrefslogtreecommitdiff
path: root/mk/buildlink3
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-01-25 13:09:46 +0000
committerjlam <jlam@pkgsrc.org>2004-01-25 13:09:46 +0000
commit16bc5e556ddbb0f63978d45e0f5e4aba722b5603 (patch)
tree2a240a2635bf73216ead2813be29fa86ee09d179 /mk/buildlink3
parent6f05de440d482f36cfa0f0efcb6a25e878d603da (diff)
downloadpkgsrc-16bc5e556ddbb0f63978d45e0f5e4aba722b5603.tar.gz
Suppress duplicate dependencies in the DEPENDS and BUILD_DEPENDS list
added by buildlink3.mk files if the dependencies are _exactly_ the same.
Diffstat (limited to 'mk/buildlink3')
-rw-r--r--mk/buildlink3/bsd.buildlink3.mk12
1 files changed, 8 insertions, 4 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index bbf1aadd6fd..465554d7f84 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.55 2004/01/25 12:43:24 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.56 2004/01/25 13:09:46 jlam Exp $
#
# An example package buildlink3.mk file:
#
@@ -98,6 +98,9 @@ _BLNK_PACKAGES+= ${_pkg_}
. endif
.endfor
+DEPENDS?= # empty
+BUILD_DEPENDS?= # empty
+
.for _pkg_ in ${_BLNK_DEPENDS}
#
# Add the proper dependency on each package pulled in by buildlink3.mk
@@ -117,9 +120,10 @@ _BLNK_DEPMETHOD.${_pkg_}= BUILD_DEPENDS
. endif
. if defined(BUILDLINK_DEPENDS.${_pkg_}) && \
defined(BUILDLINK_PKGSRCDIR.${_pkg_})
-. for _depends_ in ${BUILDLINK_DEPENDS.${_pkg_}}
-${_BLNK_DEPMETHOD.${_pkg_}}+= \
- ${_depends_}:${BUILDLINK_PKGSRCDIR.${_pkg_}}
+. for _depend_ in ${BUILDLINK_DEPENDS.${_pkg_}}
+. if empty(${_BLNK_DEPMETHOD.${_pkg_}}:M${_depend_}\:*)
+${_BLNK_DEPMETHOD.${_pkg_}}+= ${_depend_}:${BUILDLINK_PKGSRCDIR.${_pkg_}}
+. endif
. endfor
. endif
. if defined(BUILDLINK_RECOMMENDED.${_pkg_}) && \