[packages/ocaml-ulex] - add ocaml_opt bcond - rel 3

baggins baggins at pld-linux.org
Sat Jul 25 19:42:36 CEST 2015


commit 99ac37b6e921740cd8db14a979244d3cdd132395
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Jul 25 19:42:21 2015 +0200

    - add ocaml_opt bcond
    - rel 3

 ocaml-ulex.spec | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/ocaml-ulex.spec b/ocaml-ulex.spec
index 2808003..8e9d417 100644
--- a/ocaml-ulex.spec
+++ b/ocaml-ulex.spec
@@ -1,8 +1,17 @@
+#
+# Conditional build:
+%bcond_without	ocaml_opt	# skip building native optimized binaries (bytecode is always built)
+
+# not yet available on x32 (ocaml 4.02.1), remove when upstream will support it
+%ifnarch %{ix86} %{x8664} arm aarch64 ppc sparc sparcv9
+%undefine	with_ocaml_opt
+%endif
+
 Summary:	Lexer generator for Unicode and OCaml
 Summary(pl.UTF-8):	Lexer dla OCamla i Unicode
 Name:		ocaml-ulex
 Version:	1.1
-Release:	2
+Release:	3
 License:	MIT
 Group:		Development/Tools
 Source0:	http://www.cduce.org/download/ulex-%{version}.tar.gz
@@ -22,7 +31,7 @@ ulex jest lexerem dla OCamla i Unicode.
 %setup -q -n ulex-%{version}
 
 %build
-%{__make} -j1 all all.opt \
+%{__make} -j1 all %{?with_ocaml_opt:all.opt} \
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -46,8 +55,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README
 %dir %{_libdir}/ocaml/ulex
-%{_libdir}/ocaml/ulex/*.cm*
+%{_libdir}/ocaml/ulex/*.cma
+%{_libdir}/ocaml/ulex/*.cm[xi]
+%if %{with ocaml_opt}
 %{_libdir}/ocaml/ulex/ulexing.a
+%{_libdir}/ocaml/ulex/*.cmxa
+%endif
 %{_libdir}/ocaml/ulex/ulexing.mli
 %{_libdir}/ocaml/ulex/utf8.mli
 %{_libdir}/ocaml/site-lib/ulex
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ocaml-ulex.git/commitdiff/99ac37b6e921740cd8db14a979244d3cdd132395



More information about the pld-cvs-commit mailing list