diff options
| author | sbd <sbd@pkgsrc.org> | 2012-06-22 11:36:10 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2012-06-22 11:36:10 +0000 |
| commit | 60c0dbf02efbc5473b87523916bc08199e75ce6a (patch) | |
| tree | f11e91d22560fc6175d6bcdaad204307a2e4fa78 /lang | |
| parent | 73144f8fd84478dd1e3f85e483aab293c2432549 (diff) | |
| download | pkgsrc-60c0dbf02efbc5473b87523916bc08199e75ce6a.tar.gz | |
When linking with a non-builtin BDB an rpath to it libdir is needed.
Bump PKGREVISION.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ocaml/Makefile | 4 | ||||
| -rw-r--r-- | lang/ocaml/Makefile.common | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index 96153255195..7783f2d1cba 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.77 2012/03/12 12:28:04 fhajny Exp $ +# $NetBSD: Makefile,v 1.78 2012/06/22 11:36:10 sbd Exp $ + +PKGREVISION= 1 PKG_DESTDIR_SUPPORT= user-destdir diff --git a/lang/ocaml/Makefile.common b/lang/ocaml/Makefile.common index 317f714d590..6244fb9ae5d 100644 --- a/lang/ocaml/Makefile.common +++ b/lang/ocaml/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.32 2012/03/04 09:06:46 asau Exp $ +# $NetBSD: Makefile.common,v 1.33 2012/06/22 11:36:10 sbd Exp $ # used by x11/labltk/Makefile # used by x11/ocaml-graphics/Makefile @@ -14,7 +14,7 @@ LICENSE= gnu-gpl-v2 USE_TOOLS+= gmake HAS_CONFIGURE= yes -CONFIGURE_ENV+= BDB_LIBS=${BDB_LIBS:Q} +CONFIGURE_ENV+= BDB_LIBS=${BDB_LINK:Q} CONFIGURE_ENV+= BDB_BUILTIN=${USE_BUILTIN.${BDB_TYPE}:Q} CONFIGURE_ARGS+= -prefix ${PREFIX} CONFIGURE_ARGS+= -libs ${LDFLAGS:Q} @@ -36,6 +36,11 @@ INSTALL_UNSTRIPPED= yes .include "../../mk/bdb.buildlink3.mk" +BDB_LINK= ${BDB_LIBS} +.if empty(BDBBASE:M/usr) +BDB_LINK+= -L${BDBBASE}/lib ${COMPILER_RPATH_FLAG}${BDBBASE}/lib +.endif + post-extract: cp-power-bsd cp-gnu-config .PHONY: cp-power-bsd |