pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/ocaml Do not use the wrapper for ocaml (the wrapp...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c8d7d61f3ebd
branches:  trunk
changeset: 507152:c8d7d61f3ebd
user:      tonio <tonio%pkgsrc.org@localhost>
date:      Fri Jan 27 19:03:16 2006 +0000

description:
Do not use the wrapper for ocaml (the wrapper is incorrect then, it tries to pass -cclib as argument, but this is not an argument for ocaml)
Instead, create a symlink for ocaml
(this was causing problems in coq configure, which runs ocaml to detect its version)

diffstat:

 lang/ocaml/buildlink3.mk |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (31 lines):

diff -r 0b5ee1f4bff0 -r c8d7d61f3ebd lang/ocaml/buildlink3.mk
--- a/lang/ocaml/buildlink3.mk  Fri Jan 27 18:08:10 2006 +0000
+++ b/lang/ocaml/buildlink3.mk  Fri Jan 27 19:03:16 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2005/02/04 21:35:51 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/01/27 19:03:16 tonio Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 OCAML_BUILDLINK3_MK:=  ${OCAML_BUILDLINK3_MK}+
@@ -24,8 +24,9 @@
                                { print "@comment in ocaml: " $$0; next }
 
 BUILDLINK_TARGETS+=    ocaml-wrappers
-OCAML_WRAPPERS=                ocaml ocamlc ocamlc.opt ocamlcp ocamlmklib ocamlmktop \
+OCAML_WRAPPERS=                ocamlc ocamlc.opt ocamlcp ocamlmklib ocamlmktop \
                        ocamlopt ocamlopt.opt
+OCAMLBIN_WRAPPERS=     ocaml
 
 ocaml-wrappers:
        ${_PKG_SILENT}${_PKG_DEBUG} \
@@ -38,6 +39,10 @@
                        >${BUILDLINK_DIR}/bin/$$w; \
                ${CHMOD} +x ${BUILDLINK_DIR}/bin/$$w; \
        done
+       for w in ${OCAMLBIN_WRAPPERS}; do \
+               ${LN} -s ${BUILDLINK_PREFIX.ocaml}/bin/$$w \
+                        ${BUILDLINK_DIR}/bin/$$w; \
+       done
 
 .endif # OCAML_BUILDLINK3_MK
 



Home | Main Index | Thread Index | Old Index