packages: xen/xen.spec - added ocaml bcond

baggins baggins at pld-linux.org
Mon Mar 5 14:15:58 CET 2012


Author: baggins                      Date: Mon Mar  5 13:15:58 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added ocaml bcond

---- Files affected:
packages/xen:
   xen.spec (1.106 -> 1.107) 

---- Diffs:

================================================================
Index: packages/xen/xen.spec
diff -u packages/xen/xen.spec:1.106 packages/xen/xen.spec:1.107
--- packages/xen/xen.spec:1.106	Mon Mar  5 14:07:35 2012
+++ packages/xen/xen.spec	Mon Mar  5 14:15:53 2012
@@ -4,6 +4,10 @@
 #  - most of the qemu config options aren't detected (curses, NPTL, vde, fdt)
 #  - package the ocaml stuff
 #
+#
+# Conditional build:
+%bcond_with	ocaml		# build Ocaml libraries for Xen tools
+#
 %define	xen_extfiles_url	http://xenbits.xensource.com/xen-extfiles
 Summary:	Xen - a virtual machine monitor
 Summary(pl.UTF-8):	Xen - monitor maszyny wirtualnej
@@ -75,6 +79,11 @@
 BuildRequires:	latex2html
 BuildRequires:	libidn-devel
 BuildRequires:	ncurses-devel
+%if %{with ocaml}
+BuildRequires:	ocaml >= 3.04-7
+BuildRequires:	ocaml-findlib
+%requires_eq	ocaml-runtime
+%endif
 BuildRequires:	pciutils-devel
 BuildRequires:	pkgconfig
 BuildRequires:	python-devel
@@ -234,6 +243,7 @@
 export CXXFLAGS="%{rpmcflags} -I/usr/include/ncurses"
 
 %{__make} dist-xen dist-tools dist-docs \
+	%{!?with_ocaml:OCAML_TOOLS=n} \
 	prefix=%{_prefix} \
 	CC="%{__cc}" \
 	CXX="%{__cxx}"
@@ -241,6 +251,7 @@
 unset CFLAGS
 unset CXXFLAGS
 %{__make} -j1 dist-stubdom \
+	%{!?with_ocaml:OCAML_TOOLS=n} \
 	CC="%{__cc}" \
 	CXX="%{__cxx}"
 
@@ -250,6 +261,7 @@
 	$RPM_BUILD_ROOT{/usr/lib/tmpfiles.d,%{systemdunitdir}}
 
 %{__make} -j1 install-xen install-tools install-stubdom install-docs \
+	%{!?with_ocaml:OCAML_TOOLS=n} \
 	prefix=%{_prefix} \
 	DESTDIR=$RPM_BUILD_ROOT
 
@@ -465,6 +477,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.107  2012/03/05 13:15:53  baggins
+- added ocaml bcond
+
 Revision 1.106  2012/03/05 13:07:35  baggins
 - install blktapctrl service
 - add systemd bits
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xen/xen.spec?r1=1.106&r2=1.107&f=u



More information about the pld-cvs-commit mailing list