kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

We include gmp/buildlink3.mk outside of the BUILDLINK_DEPTH guards so

Browse source 
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.
This commit is contained in:
jlam 2006-03-22 15:12:07 +00:00
parent ba374271a4
commit 4dd4a66c0d
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
devel/darcs/Makefile
View file

@ -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"

10
lang/ghc/buildlink3.mk
View file

@ -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"

4
x11/wxhaskell/Makefile
View file

@ -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"