From 48bb3208c4b69f79babb07fa6ce8f1501d1237aa Mon Sep 17 00:00:00 2001 From: John Marino Date: Sun, 29 Jan 2017 23:13:59 +0000 Subject: [PATCH] math/ocaml-zarith: Unbreak after ocaml-findlib change Use the same technique madpilot used on x11-toolkits/ocaml-lablgtk2 to restore the build after the (unexpected) changed to the output of ocamlfindlib during its update to 1.7.1 --- math/ocaml-zarith/Makefile | 2 -- math/ocaml-zarith/files/patch-configure | 9 +++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/math/ocaml-zarith/Makefile b/math/ocaml-zarith/Makefile index 861963520351..bb9bc52dc219 100644 --- a/math/ocaml-zarith/Makefile +++ b/math/ocaml-zarith/Makefile @@ -13,8 +13,6 @@ COMMENT= OCaml arithmetic library for arbitrary precision integers LICENSE= LGPL20 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= does not build - LIB_DEPENDS= libgmp.so:math/gmp USES= gmake perl5 shebangfix tar:tgz diff --git a/math/ocaml-zarith/files/patch-configure b/math/ocaml-zarith/files/patch-configure index 6a42bd3e0d82..b451ff3514d9 100644 --- a/math/ocaml-zarith/files/patch-configure +++ b/math/ocaml-zarith/files/patch-configure @@ -11,6 +11,15 @@ IFS=':' for i in $PATH do +@@ -258,7 +262,7 @@ searchbin ocamlfind + if test $? -eq 1 -a $ocamlfind != "no"; then + instmeth='findlib' + if test "$installdir" = "auto" +- then installdir=`ocamlfind printconf destdir`; fi ++ then installdir=`ocamlfind printconf destdir | sed 's/:.*//'`; fi + else + searchbin install + if test $? -eq 1; then instmeth='install' @@ -304,6 +308,14 @@ case $host in arch='i686' fi