[packages/nbdkit] - fixed build without ocaml, x32 is missing ocaml_opt support

qboosh qboosh at pld-linux.org
Fri Jul 3 19:36:14 CEST 2015


commit 12eebe69829c281cb81ef949d87e3c813c026d23
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Jul 3 19:38:08 2015 +0200

    - fixed build without ocaml, x32 is missing ocaml_opt support

 nbdkit.spec | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/nbdkit.spec b/nbdkit.spec
index 8627cfd..7e847b1 100644
--- a/nbdkit.spec
+++ b/nbdkit.spec
@@ -1,15 +1,19 @@
 #
 # Conditional build:
-%bcond_without	ocaml		# OCaml plugin
+%bcond_without	ocaml		# OCaml plugin (requires ocaml_opt support)
 %bcond_without	perl		# Perl plugin
 %bcond_without	python		# Python plugin
 %bcond_with	vddk		# VMware VDDK plugin [needs proprietary VDDK]
 #
+%ifarch x32
+# no ocaml_opt support
+%undefine	with_ocaml
+%endif
 Summary:	Toolkit for creating NBD servers
 Summary(pl.UTF-8):	Narzędzia do tworzenia serwerów NBD
 Name:		nbdkit
 Version:	1.1.10
-Release:	1
+Release:	2
 License:	BSD
 Group:		Applications/System
 Source0:	http://libguestfs.org/download/nbdkit/%{name}-%{version}.tar.gz
@@ -161,7 +165,9 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/nbdkit/plugins/*.la
+%if %{with ocaml}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libnbdkitocaml.la
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nbdkit.git/commitdiff/12eebe69829c281cb81ef949d87e3c813c026d23



More information about the pld-cvs-commit mailing list