[packages/ocaml-SDL] - really disable ocamlopt if not supported (configure sets OCAMLOPT=no while Makefiles check with if

qboosh qboosh at pld-linux.org
Wed Jul 22 20:29:55 CEST 2015


commit 6382d7bbff9fb8844f9dd469519661ff29534ca0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Jul 22 20:31:16 2015 +0200

    - really disable ocamlopt if not supported (configure sets OCAMLOPT=no while Makefiles check with ifdef)

 ocaml-SDL.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/ocaml-SDL.spec b/ocaml-SDL.spec
index e595621..ac1f70f 100644
--- a/ocaml-SDL.spec
+++ b/ocaml-SDL.spec
@@ -72,14 +72,16 @@ cp -f /usr/share/automake/config.* support
 %{__aclocal} -I support
 %{__autoconf}
 %configure
-%{__make}
+%{__make} \
+	%{!?with_ocaml_opt:OCAMLOPT=}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
 
 %{__make} install \
-	OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
+	OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml \
+	%{!?with_ocaml_opt:OCAMLOPT=}
 
 # ocamlfind-specific, useless in rpm
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/*.owner
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ocaml-SDL.git/commitdiff/6382d7bbff9fb8844f9dd469519661ff29534ca0



More information about the pld-cvs-commit mailing list