[packages/ocaml-camomile] - added ocam_opt bcond - rel 3

baggins baggins at pld-linux.org
Mon Apr 6 09:12:55 CEST 2015


commit 344107f53dfe3dd20c28480b311e053ed9d30ca7
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Apr 6 07:12:35 2015 +0000

    - added ocam_opt bcond
    - rel 3

 ocaml-camomile.spec | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)
---
diff --git a/ocaml-camomile.spec b/ocaml-camomile.spec
index 3ef7fc7..9b0d2ee 100644
--- a/ocaml-camomile.spec
+++ b/ocaml-camomile.spec
@@ -1,8 +1,23 @@
+#
+# 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
+
+%if %{without ocaml_opt}
+%define		no_install_post_strip	1
+# no opt means no native binary, stripping bytecode breaks such programs
+%define		_enable_debug_packages	0
+%endif
+
 Summary:	Camomile - comprehensive Unicode library for OCaml
 Summary(pl.UTF-8):	Camomile - obszerna biblioteka unikodowa dla OCamla
 Name:		ocaml-camomile
 Version:	0.8.3
-Release:	2
+Release:	3
 License:	LGPL v2+ with linking exception
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/camomile/camomile-%{version}.tar.bz2
@@ -54,7 +69,7 @@ biblioteki Camomile.
 %configure
 
 # build seems racy
-%{__make} -j1
+%{__make} -j1 byte %{?with_ocaml_opt:opt} unidata unimaps charmap_data locale_data
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -84,7 +99,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc camomileLibrary*.mli
 %dir %{_libdir}/ocaml/camomile
+%if %{with ocaml_opt}
 %{_libdir}/ocaml/camomile/camomile.a
-%{_libdir}/ocaml/camomile/camomile.cm[ax]*
+%{_libdir}/ocaml/camomile/camomile.cmx*
+%endif
+%{_libdir}/ocaml/camomile/camomile.cma*
 %{_libdir}/ocaml/camomile/camomileLibrary*.cm[ixa]*
 %{_libdir}/ocaml/site-lib/camomile
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ocaml-camomile.git/commitdiff/344107f53dfe3dd20c28480b311e053ed9d30ca7



More information about the pld-cvs-commit mailing list