diff options
| author | seb <seb@pkgsrc.org> | 2004-03-30 14:01:30 +0000 |
|---|---|---|
| committer | seb <seb@pkgsrc.org> | 2004-03-30 14:01:30 +0000 |
| commit | 538875526b890968811a1974265aadcc144219b7 (patch) | |
| tree | 9c8f0c980dc18355c249e534ec42e4d7f8cb6e91 /lang/ocaml | |
| parent | 4a27b937b04f3064dc8e1c12985e48c7ac98403c (diff) | |
| download | pkgsrc-538875526b890968811a1974265aadcc144219b7.tar.gz | |
Just pass all CPPFLAGS, CFLAGS and LDFLAGS to configure as
${CC} with options or '-libs' specification.
This fix the build of the package with threaded tcl/tk libraries
from the tcl/tk packages.
While here remove FIX_RPATH, bl3 framework takes care of that for us.
Diffstat (limited to 'lang/ocaml')
| -rw-r--r-- | lang/ocaml/Makefile | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index 1621aca8c18..5d0d83e73b7 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2004/03/11 21:12:22 tron Exp $ +# $NetBSD: Makefile,v 1.26 2004/03/30 14:01:30 seb Exp $ DISTNAME= ocaml-3.06 PKGREVISION= 5 @@ -15,14 +15,8 @@ USE_BUILDLINK3= yes USE_GNU_TOOLS+= make HAS_CONFIGURE= yes CONFIGURE_ARGS+= -prefix ${PREFIX} -CONFIGURE_ARGS+= -tkdefs "${OCAML_CPPFLAGS}" -CONFIGURE_ARGS+= -tklibs "${OCAML_LDFLAGS}" -CONFIGURE_ARGS+= -libs "${OCAML_LIBS}" - -OCAML_CPPFLAGS= ${CPPFLAGS} -OCAML_LDFLAGS= ${LDFLAGS:M-L*} -OCAML_LIBS= ${LDFLAGS:N-L*} -FIX_RPATH+= OCAML_LIBS +CONFIGURE_ARGS+= -cc "${CC} ${CFLAGS} ${CPPFLAGS}" +CONFIGURE_ARGS+= -libs "${LDFLAGS}" ALL_TARGET= world |