diff options
| author | jlam <jlam> | 2006-03-22 15:12:07 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-03-22 15:12:07 +0000 |
| commit | 97cb880f1df50f3b22adbd1fb20c22dde2a5d596 (patch) | |
| tree | cc04a7d076566c3b673fd03e872fb264125ad49f | |
| parent | c388a175ddd559cf74fa2c2feece0aabf144e3f7 (diff) | |
| download | pkgsrc-97cb880f1df50f3b22adbd1fb20c22dde2a5d596.tar.gz | |
We include gmp/buildlink3.mk outside of the BUILDLINK_DEPTH guards so
that "gmp" is registered as a direct dependency for any package that
includes ghc/buildlink3.mk to get ghc as a build dependency. This is
needed since software built by ghc requires routines from the "gmp"
shared library. This fixes PR pkg/33100.
Remove the workaround in devel/darcs and x11/wxhaskell.
| -rw-r--r-- | devel/darcs/Makefile | 4 | ||||
| -rw-r--r-- | lang/ghc/buildlink3.mk | 10 | ||||
| -rw-r--r-- | x11/wxhaskell/Makefile | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/devel/darcs/Makefile b/devel/darcs/Makefile index ca77e6b1b85..9638a7730f3 100644 --- a/devel/darcs/Makefile +++ b/devel/darcs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/03/19 15:54:13 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2006/03/22 15:12:07 jlam Exp $ DISTNAME= darcs-1.0.4 PKGREVISION= 2 @@ -18,7 +18,5 @@ GNU_CONFIGURE= yes .include "../../www/curl/buildlink3.mk" .include "../../lang/ghc/buildlink3.mk" -# gmp should be implied by ghc, but isn't (PR 33100) -.include "../../devel/gmp/buildlink3.mk" .include "../../mk/tex.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/ghc/buildlink3.mk b/lang/ghc/buildlink3.mk index 69ddf403e11..d97a2abeca9 100644 --- a/lang/ghc/buildlink3.mk +++ b/lang/ghc/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:45 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2006/03/22 15:12:07 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GHC_BUILDLINK3_MK:= ${GHC_BUILDLINK3_MK}+ @@ -18,7 +18,13 @@ BUILDLINK_PKGSRCDIR.ghc?= ../../lang/ghc BUILDLINK_DEPMETHOD.ghc?= build .endif # GHC_BUILDLINK3_MK -.include "../../devel/gmp/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} + +# We include gmp/buildlink3.mk here so that "gmp" is registered as a +# direct dependency for any package that includes this buildlink3.mk +# to get ghc as a build dependency. This is needed since software +# built by ghc requires routines from the "gmp" shared library. +# +.include "../../devel/gmp/buildlink3.mk" diff --git a/x11/wxhaskell/Makefile b/x11/wxhaskell/Makefile index 0a85e52fada..0192e686f26 100644 --- a/x11/wxhaskell/Makefile +++ b/x11/wxhaskell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/03/19 15:54:13 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2006/03/22 15:12:07 jlam Exp $ DISTNAME= wxhaskell-src-0.9.4 PKGNAME= ${DISTNAME:S/-src//} @@ -22,7 +22,5 @@ pre-configure: cd ${WRKSRC}; ./configure --prefix=${PREFIX} --with-opengl .include "../../lang/ghc/buildlink3.mk" -# gmp should be implied by ghc, but isn't (PR 33100) -.include "../../devel/gmp/buildlink3.mk" .include "../../x11/wxGTK/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |