Date: Sat, 26 Apr 2014 22:20:01 GMT From: Michael <michipili@gmail.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/189039: math/ocaml-gsl: Update to 1.15.1 Message-ID: <201404262220.s3QMK1Bn095981@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/189039; it has been noted by GNATS.
From: Michael <michipili@gmail.com>
To: bug-followup@FreeBSD.org, michipili@gmail.com
Cc:
Subject: Re: ports/189039: math/ocaml-gsl: Update to 1.15.1
Date: Sun, 27 Apr 2014 00:15:18 +0200
This is a multi-part message in MIME format.
--------------060400080900010604050908
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
This is the patch to Mk/bsd.ocaml.mk which I promised when opening the
ticket.
--------------060400080900010604050908
Content-Type: text/plain; charset=UTF-8;
name="patch-Mk-bsd-ocaml-mk.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="patch-Mk-bsd-ocaml-mk.txt"
--- Mk/bsd.ocaml.mk.orig 2014-03-29 15:19:00.000000000 +0100
+++ Mk/bsd.ocaml.mk 2014-04-26 22:40:27.000000000 +0200
@@ -78,6 +78,16 @@
#
OCAML_LDCONF?= ${OCAML_LIBDIR}/ld.conf
+# ocaml-findlib-1.4.1_1 wants to edit our ld.conf file, which does not
+# work well with staging.
+.if defined(USE_OCAML_LDCONFIG)
+. if !target(ocaml-ldconfig)
+. if !defined(NO_STAGE)
+OCAMLFIND_LDCONF?= /dev/null
+. endif
+. endif
+.endif
+
OCAMLFIND_DESTDIR?= ${PREFIX}/${OCAML_SITELIBDIR}
OCAMLFIND_LDCONF?= ${PREFIX}/${OCAML_LDCONF}
--------------060400080900010604050908--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404262220.s3QMK1Bn095981>