[pkgsrc/trunk]: pkgsrc We include gmp/buildlink3.mk outside of the BUILDLINK_...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1dd8804d58ea
branches:  trunk
changeset: 510007:1dd8804d58ea
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Mar 22 15:12:07 2006 +0000

description:
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.

diffstat:

 devel/darcs/Makefile   |   4 +---
 lang/ghc/buildlink3.mk |  10 ++++++++--
 x11/wxhaskell/Makefile |   4 +---
 3 files changed, 10 insertions(+), 8 deletions(-)

diffs (58 lines):

diff -r e1478ee269e6 -r 1dd8804d58ea devel/darcs/Makefile
--- a/devel/darcs/Makefile      Wed Mar 22 15:07:41 2006 +0000
+++ b/devel/darcs/Makefile      Wed Mar 22 15:12:07 2006 +0000
@@ -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 @@
 
 .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 -r e1478ee269e6 -r 1dd8804d58ea lang/ghc/buildlink3.mk
--- a/lang/ghc/buildlink3.mk    Wed Mar 22 15:07:41 2006 +0000
+++ b/lang/ghc/buildlink3.mk    Wed Mar 22 15:12:07 2006 +0000
@@ -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_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 -r e1478ee269e6 -r 1dd8804d58ea x11/wxhaskell/Makefile
--- a/x11/wxhaskell/Makefile    Wed Mar 22 15:07:41 2006 +0000
+++ b/x11/wxhaskell/Makefile    Wed Mar 22 15:12:07 2006 +0000
@@ -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 @@
        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"