diff options
| author | grant <grant@pkgsrc.org> | 2004-01-25 04:15:44 +0000 |
|---|---|---|
| committer | grant <grant@pkgsrc.org> | 2004-01-25 04:15:44 +0000 |
| commit | 6903f248e78be4bfec539f5427ffd565837c3a14 (patch) | |
| tree | 369da4b9900c6b0fd70a4bd0a7fd925a5d2f6871 /devel/zlib | |
| parent | e1aa0a574cd8ed518b70b630b30706a73f0958ed (diff) | |
| download | pkgsrc-6903f248e78be4bfec539f5427ffd565837c3a14.tar.gz | |
if we have determined that we need pkgsrc zlib, set
BUILDLINK_DEPENDS.zlib instead of adding to it.
fixes a problem where a buildlink dependency would be added on both
zlib>=1.1.4nb1 and zlib>=1.2.1, resulting in various buildlink
breakage.
Diffstat (limited to 'devel/zlib')
| -rw-r--r-- | devel/zlib/buildlink3.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/devel/zlib/buildlink3.mk b/devel/zlib/buildlink3.mk index e57e721e817..c74a05ac16c 100644 --- a/devel/zlib/buildlink3.mk +++ b/devel/zlib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/01/24 03:12:32 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2004/01/25 04:15:44 grant Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ZLIB_BUILDLINK3_MK:= ${ZLIB_BUILDLINK3_MK}+ @@ -90,7 +90,7 @@ MAKEFLAGS+= BUILDLINK_USE_BUILTIN.zlib="${BUILDLINK_USE_BUILTIN.zlib}" # If we depend on the package, depend on the latest version with a library # major number bump. # -BUILDLINK_DEPENDS.zlib+= zlib>=1.2.1 +BUILDLINK_DEPENDS.zlib= zlib>=1.2.1 . if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= zlib . endif |