diff options
| author | minskim <minskim> | 2005-06-14 21:00:41 +0000 |
|---|---|---|
| committer | minskim <minskim> | 2005-06-14 21:00:41 +0000 |
| commit | 8f08a88988873e6206652e23976901b6a7f08fc8 (patch) | |
| tree | 8d50293fe79f13fec71f5b5fbc7ce6df00339598 /lang/ocaml | |
| parent | 244a0031081994c59283dcac9519f670dfb04006 (diff) | |
| download | pkgsrc-8f08a88988873e6206652e23976901b6a7f08fc8.tar.gz | |
Let x11/labltk use bdb if native ndbm is not available.
Diffstat (limited to 'lang/ocaml')
| -rw-r--r-- | lang/ocaml/Makefile | 7 | ||||
| -rw-r--r-- | lang/ocaml/Makefile.common | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index d5e1a2add7f..f8fa94825d6 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -1,13 +1,9 @@ -# $NetBSD: Makefile,v 1.37 2005/06/07 00:59:48 minskim Exp $ +# $NetBSD: Makefile,v 1.38 2005/06/14 21:00:41 minskim Exp $ .include "Makefile.common" CONFIGURE_ARGS+= -no-tk CONFIGURE_ENV+= disable_x11=yes -CONFIGURE_ENV+= BDB_LIBS=${BDB_LIBS} \ - BDB_BUILTIN=${USE_BUILTIN.${BDB_TYPE}} - -CPPFLAGS+= -DDB_DBM_HSEARCH BUILD_TARGET= world .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \ @@ -24,5 +20,4 @@ PLIST_SRC+= ${PKGDIR}/PLIST PLIST_SRC+= ${PKGDIR}/PLIST.stub .endif -.include "../../mk/bdb.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/ocaml/Makefile.common b/lang/ocaml/Makefile.common index 3ee29be2ea2..4301f0dd307 100644 --- a/lang/ocaml/Makefile.common +++ b/lang/ocaml/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2005/05/22 20:08:10 jlam Exp $ +# $NetBSD: Makefile.common,v 1.10 2005/06/14 21:00:41 minskim Exp $ DISTNAME= ocaml-3.08.3 CATEGORIES= lang @@ -17,6 +17,9 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS+= -prefix ${PREFIX} CONFIGURE_ARGS+= -libs "${LDFLAGS}" CONFIGURE_ARGS+= -with-pthread +CONFIGURE_ENV+= BDB_LIBS=${BDB_LIBS} \ + BDB_BUILTIN=${USE_BUILTIN.${BDB_TYPE}} +CPPFLAGS+= -DDB_DBM_HSEARCH .include "../../mk/bsd.prefs.mk" @@ -24,6 +27,8 @@ CONFIGURE_ARGS+= -with-pthread INSTALL_UNSTRIPPED= yes .endif +.include "../../mk/bdb.buildlink3.mk" + post-extract: cp-power-bsd cp-gnu-config cp-power-bsd: |