Date: Sun, 16 Aug 2015 12:40:39 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r394406 - in head/devel/ocaml-lacaml: . files Message-ID: <201508161240.t7GCed3Y054272@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Sun Aug 16 12:40:39 2015 New Revision: 394406 URL: https://svnweb.freebsd.org/changeset/ports/394406 Log: devel/ocaml-lacaml: 7.1.5 -> 7.2.6 2015-07-01: Fixed a bug in the complex version of Vec.ssqr_diff. Thanks to Akinori Abe for the patch! 2015-06-30: Fixed Oasis-related linking problem (again). Really annoying, but Oasis still generates code that prevents proper linking. 2015-06-29: Improved portability to some Linux-platforms. Thanks to Akinori Abe for the patch! 2015-06-03: Fixed Oasis-related linking problem (again). 2015-05-31: Fixed several offset calculation bugs for certain default argument combinations. Thanks to Chris Hardin <chardin@janestreet.com> for the first patch! 2015-03-16: Added support for the general Schur factorization for both real and complex numbers: * gees Thanks to Florent Hoareau <h.florent@gmail.com> for this contribution! 2014-10-22: Fixed string handling for new OCaml version 4.02 (String/Bytes modules). Requires new findlib version (>= 1.5). PR: 199226 Submitted by: tkato432@yahoo.com Added: head/devel/ocaml-lacaml/files/ head/devel/ocaml-lacaml/files/patch-myocamlbuild.ml (contents, props changed) Modified: head/devel/ocaml-lacaml/Makefile head/devel/ocaml-lacaml/distinfo Modified: head/devel/ocaml-lacaml/Makefile ============================================================================== --- head/devel/ocaml-lacaml/Makefile Sun Aug 16 12:17:40 2015 (r394405) +++ head/devel/ocaml-lacaml/Makefile Sun Aug 16 12:40:39 2015 (r394406) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= lacaml -PORTVERSION= 7.1.5 +PORTVERSION= 7.2.6 DISTVERSIONPREFIX= v CATEGORIES= devel PKGNAMEPREFIX= ocaml- @@ -26,11 +26,11 @@ USES= blaslapack fortran HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix ${PREFIX} --disable-docs --disable-examples \ --override conf_ccopt "${CFLAGS}" \ - --override conf_cclib "${LDFLAGS:S,^.*[[:space:]],,}" + --override conf_cclib "${LDFLAGS}" MAKE_JOBS_UNSAFE=yes CFLAGS+= -fPIC -DEXTERNAL_EXP10 -LDFLAGS+= -L${LOCALBASE}/lib ${BLASLIB} ${LAPACKLIB} +LDFLAGS+= -L${LOCALBASE}/lib DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME} EXAMPLESDIR= ${OCAML_EXAMPLESDIR}/${PORTNAME} @@ -40,6 +40,12 @@ PORTEXAMPLES= * OPTIONS_DEFINE= DOCS EXAMPLES +post-patch: + @${REINPLACE_CMD} -e \ + 's|%%BLASLIB%%|${BLASLIB}| ; \ + s|%%LAPACKLIB%%|${LAPACKLIB}| ; \ + s|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/myocamlbuild.ml + post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in AUTHORS.txt CHANGES.txt README.md TODO.md Modified: head/devel/ocaml-lacaml/distinfo ============================================================================== --- head/devel/ocaml-lacaml/distinfo Sun Aug 16 12:17:40 2015 (r394405) +++ head/devel/ocaml-lacaml/distinfo Sun Aug 16 12:40:39 2015 (r394406) @@ -1,2 +1,2 @@ -SHA256 (mmottl-lacaml-v7.1.5_GH0.tar.gz) = bbb3f44c004d7eb1f1b462836929cc87148ea218122e9bece22ab05dc471cf4e -SIZE (mmottl-lacaml-v7.1.5_GH0.tar.gz) = 162972 +SHA256 (mmottl-lacaml-v7.2.6_GH0.tar.gz) = ae525319ef146e6b661cde4442e188376982d6ca0767b228319129e4b0b7ab7c +SIZE (mmottl-lacaml-v7.2.6_GH0.tar.gz) = 171304 Added: head/devel/ocaml-lacaml/files/patch-myocamlbuild.ml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ocaml-lacaml/files/patch-myocamlbuild.ml Sun Aug 16 12:40:39 2015 (r394406) @@ -0,0 +1,18 @@ +--- myocamlbuild.ml.orig 2015-03-17 03:34:14 UTC ++++ myocamlbuild.ml +@@ -1118,13 +1118,13 @@ let package_default = + (["oasis_library_lacaml_cclib"; "link"], + [ + (OASISExpr.EBool true, +- S [A "-cclib"; A "-lblas"; A "-cclib"; A "-llapack"]); ++ S [A "-cclib"; A "-L/usr/local/lib"; A "-cclib"; A "-lblas"; A "-cclib"; A "-llapack"]); + (OASISExpr.ETest ("system", "macosx"), + S [A "-cclib"; A "-framework"; A "-cclib"; A "Accelerate"]) + ]); + (["oasis_library_lacaml_cclib"; "ocamlmklib"; "c"], + [ +- (OASISExpr.EBool true, S [A "-lblas"; A "-llapack"]); ++ (OASISExpr.EBool true, S [A "-L/usr/local/lib"; A "-lblas"; A "-llapack"]); + (OASISExpr.ETest ("system", "macosx"), + S [A "-framework"; A "Accelerate"]) + ])
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508161240.t7GCed3Y054272>