- cleaned up ocaml_opt bcond usage

diff --git a/ocaml-curl.spec b/ocaml-curl.spec
index 383fa81f7a841022b75a48050af143159afaa054..042acebb840f74ef1e07acd74a6be16791b2fbb8 100644 (file)
--- a/ocaml-curl.spec
+++ b/ocaml-curl.spec
@@ -49,11 +49,7 @@ developing applications that use %{name}.
 
 %build
 %configure
 
 %build
 %configure

-%{__make} -j1 all \
-%if %{with ocaml_opt}
-       OCBYTE="ocamlc.opt -g" \
-       OCOPT="ocamlopt.opt -g"
-%endif
+%{__make} -j1 all

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT


@@ -90,8 +86,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/ocaml/stublibs/dllcurl-helper.so.owner
 %if %{with ocaml_opt}
 %exclude %{_libdir}/ocaml/curl/*.a
 %{_libdir}/ocaml/stublibs/dllcurl-helper.so.owner
 %if %{with ocaml_opt}
 %exclude %{_libdir}/ocaml/curl/*.a

-%exclude %{_libdir}/ocaml/curl/*.o
-%exclude %{_libdir}/ocaml/curl/*.cmx

 %exclude %{_libdir}/ocaml/curl/*.cmxa
 %endif
 %exclude %{_libdir}/ocaml/curl/*.mli
 %exclude %{_libdir}/ocaml/curl/*.cmxa
 %endif
 %exclude %{_libdir}/ocaml/curl/*.mli


@@ -101,8 +95,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc examples/*
 %if %{with ocaml_opt}
 %{_libdir}/ocaml/curl/*.a
 %doc examples/*
 %if %{with ocaml_opt}
 %{_libdir}/ocaml/curl/*.a

-%{_libdir}/ocaml/curl/*.o
-%{_libdir}/ocaml/curl/*.cmx

 %{_libdir}/ocaml/curl/*.cmxa
 %endif
 %{_libdir}/ocaml/curl/*.mli
 %{_libdir}/ocaml/curl/*.cmxa
 %endif
 %{_libdir}/ocaml/curl/*.mli

diff --git a/ocaml_opt.patch b/ocaml_opt.patch
index 05d0f0e4aa9e1982ce3dc27e252b4bfdd878df99..26c071a0085aae3d8ec8564f8124e64a91226d2c 100644 (file)
--- a/ocaml_opt.patch
+++ b/ocaml_opt.patch
@@ -1,13 +1,6 @@
 --- ocurl-0.7.1/Makefile.in~   2014-05-12 22:10:26.000000000 +0200
 +++ ocurl-0.7.1/Makefile.in    2015-07-25 14:46:23.107163100 +0200
 --- ocurl-0.7.1/Makefile.in~   2014-05-12 22:10:26.000000000 +0200
 +++ ocurl-0.7.1/Makefile.in    2015-07-25 14:46:23.107163100 +0200

-@@ -32,13 +32,13 @@
- TARGETS += curl_lwt.cmo
- endif
- ifeq (@OCAMLBEST@,opt)
--TARGETS += curl.cmxa
-+TARGETS += curl.cmxa curl.a
- ifneq (@OCAML_PKG_lwt@,no)
- TARGETS += curl_lwt.cmx
+@@ -32,10 +32,13 @@

  endif
  endif
  
  endif
  endif
  


@@ -16,6 +9,12 @@
  ifneq (@OCAML_PKG_lwt@,no)
  INSTALL_TARGETS += curl_lwt.cmi curl_lwt.mli curl_lwt.o
  endif
  ifneq (@OCAML_PKG_lwt@,no)
  INSTALL_TARGETS += curl_lwt.cmi curl_lwt.mli curl_lwt.o
  endif

++ifeq (@OCAMLBEST@,opt)
++INSTALL_TARGETS += curl.a
++endif
+ 
+ all:
+               @$(MAKE) depend

 @@ -97,10 +97,10 @@
                mkdir -p $(INSTALLDIR)
                $(INSTALLDATA) curl.cma $(INSTALLDIR)
 @@ -97,10 +97,10 @@
                mkdir -p $(INSTALLDIR)
                $(INSTALLDATA) curl.cma $(INSTALLDIR)