[packages/ocaml-findlib] - added opt bcond - rel 5

baggins baggins at pld-linux.org
Sun Mar 1 02:00:46 CET 2015


commit 0014a6069b84133ddebee5467eb8aa26ebbb390b
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Mar 1 01:00:48 2015 +0000

    - added opt bcond
    - rel 5

 ocaml-findlib.spec | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec
index 8b49ea9..c9d835a 100644
--- a/ocaml-findlib.spec
+++ b/ocaml-findlib.spec
@@ -1,9 +1,17 @@
+#
+# Conditional build:
+%bcond_without	opt		# build opt
+
+%ifarch x32
+%undefine	with_opt
+%endif
+
 %define		ocaml_ver	1:4.02
 Summary:	OCaml module manager
 Summary(pl.UTF-8):	Zarządca modułów OCamla
 Name:		ocaml-findlib
 Version:	1.5.5
-Release:	4
+Release:	5
 License:	distributable
 Group:		Development/Tools
 Source0:	http://download.camlcity.org/download/findlib-%{version}.tar.gz
@@ -66,7 +74,7 @@ Ten pakiet zawiera biblioteki i skompilowane interfejsy findliba.
 
 sed -i -e 's/-g//' Makefile
 
-%{__make} -j1 all opt
+%{__make} -j1 all %{?with_opt:opt}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -141,8 +149,12 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %{_libdir}/ocaml/findlib/Makefile.config
-%{_libdir}/ocaml/findlib/*.cm[ixa]*
-%{_libdir}/ocaml/findlib/*.a
+%{_libdir}/ocaml/findlib/*.cm[xi]
+%{_libdir}/ocaml/findlib/*.cma
+%if %{with opt}
+%{_libdir}/ocaml/findlib/*.[ao]
+%{_libdir}/ocaml/findlib/*.cmxa
+%endif
 %dir %{_libdir}/ocaml/num-top
 %{_libdir}/ocaml/num-top/*.cm[ia]
 %{_libdir}/ocaml/ocamlfind
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ocaml-findlib.git/commitdiff/0014a6069b84133ddebee5467eb8aa26ebbb390b



More information about the pld-cvs-commit mailing list