[packages/ocaml-cairo] - added ocaml_opt bcond - rel 7

baggins baggins at pld-linux.org
Mon Apr 6 13:49:27 CEST 2015


commit b311e417f7bc729f11580c90c0ed8333fc2cd637
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Apr 6 11:49:07 2015 +0000

    - added ocaml_opt bcond
    - rel 7

 ocaml-cairo.spec | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/ocaml-cairo.spec b/ocaml-cairo.spec
index 278f8f9..efb1d0a 100644
--- a/ocaml-cairo.spec
+++ b/ocaml-cairo.spec
@@ -1,8 +1,17 @@
+#
+# Conditional build:
+%bcond_without	ocaml_opt	# skip building native optimized binaries (bytecode is always built)
+
+%ifarch x32
+# not yet available on x32 (ocaml 4.02.1), remove when upstream will support it
+%undefine	with_ocaml_opt
+%endif
+
 Summary:	Cairo binding for OCaml
 Summary(pl.UTF-8):	Wiązania Cairo dla OCamla
 Name:		ocaml-cairo
 Version:	1.2.0
-Release:	6
+Release:	7
 License:	LGPL v2.1
 Group:		Libraries
 #Source0Download: http://cgit.freedesktop.org/cairo-ocaml/
@@ -56,7 +65,9 @@ biblioteki Cairo.
 %{__autoconf}
 %configure
 
-%{__make} -j1 CC="%{__cc} %{rpmcflags} -fPIC" all opt
+%{!?with_ocaml_opt:%{__sed} -i -e 's/OCAMLOPT .*=.*/OCAMLOPT=/' config.make}
+
+%{__make} -j1 CC="%{__cc} %{rpmcflags} -fPIC" all
 %{__make} -j1 doc
 
 %install
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ocaml-cairo.git/commitdiff/b311e417f7bc729f11580c90c0ed8333fc2cd637



More information about the pld-cvs-commit mailing list