commit 3fd8e25935f8b6c1c1e735109ab1dac63d99af8a Author: Jan Rękorajski <bagg...@pld-linux.org> Date: Sat Jun 1 10:55:48 2024 +0200
- really disable opt noopt.patch | 28 ++++++++++++++++++++++++++++ ocaml-libvirt.spec | 7 ++++++- 2 files changed, 34 insertions(+), 1 deletion(-) --- diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index 600b3d0..3d526c2 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -16,6 +16,7 @@ License: LGPL v2+ Group: Libraries Source0: https://download.libvirt.org/ocaml/%{name}-%{version}.tar.gz # Source0-md5: 6fb9d519c44d63513723a728c2ef5f40 +Patch0: noopt.patch URL: https://libvirt.org/ocaml/ BuildRequires: libvirt-devel >= 1.2.8 BuildRequires: ocaml >= 3.04-7 @@ -63,9 +64,13 @@ biblioteki. %prep %setup -q +%patch0 -p1 %build -%configure +%{__automake} +%{__autoconf} +%configure \ + %{?without_ocaml_opt:ac_cv_prog_OCAMLOPT=no} %{__make} diff --git a/noopt.patch b/noopt.patch new file mode 100644 index 0000000..5b86ad4 --- /dev/null +++ b/noopt.patch @@ -0,0 +1,28 @@ +--- ocaml-libvirt-0.6.1.7/libvirt/Makefile.am~ 2023-02-13 17:59:10.000000000 +0100 ++++ ocaml-libvirt-0.6.1.7/libvirt/Makefile.am 2024-06-01 10:45:00.210786314 +0200 +@@ -59,9 +59,13 @@ + COBJS := libvirt.cmo libvirt_version.cmo + OPTOBJS := libvirt.cmx libvirt_version.cmx + ++if HAVE_OCAMLOPT ++opt_link=-ldopt ++endif ++ + mllibvirt.cma: $(COBJS) + $(OCAMLMKLIB) -o mllibvirt \ +- -ldopt '$(LDFLAGS)' \ ++ $(opt_link) '$(LDFLAGS)' \ + $(libvirtocaml_a_OBJECTS) $(COBJS) \ + $(LIBVIRT_LIBS) + +--- ocaml-libvirt-0.6.1.7/configure.ac~ 2023-02-13 18:08:57.000000000 +0100 ++++ ocaml-libvirt-0.6.1.7/configure.ac 2024-06-01 10:53:34.638277135 +0200 +@@ -66,7 +66,7 @@ + fi + + dnl Optional programs. +-AM_CONDITIONAL([HAVE_OCAMLOPT], [test "x$OCAMLOPT" != "x"]) ++AM_CONDITIONAL([HAVE_OCAMLOPT], [test "x$ac_cv_prog_OCAMLOPT" != "xno"]) + AM_CONDITIONAL([HAVE_OCAMLDOC], [test "x$OCAMLDOC" != "x"]) + + dnl Summary. ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ocaml-libvirt.git/commitdiff/3fd8e25935f8b6c1c1e735109ab1dac63d99af8a _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit