Attachment 876061 Details for Bug 1077869 – hivex.no.ocaml.native.compiler.patch

[patch] hivex.no.ocaml.native.compiler.patch

hivex.no.ocaml.native.compiler.patch (text/plain), 1.23 KB, created by Michel Normand on 2014-03-18 18:16:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Normand

Created: 2014-03-18 18:16:33 UTC

Size: 1.23 KB

patch

obsolete

>From 09ba4a89e483e4543e23b6cf80e921b4f7f2450f Mon Sep 17 00:00:00 2001
>From: Michel Normand <normand@linux.vnet.ibm.com>
>Date: Tue, 18 Mar 2014 14:01:25 -0400
>Subject: [PATCH] ocaml-hivex do not provide  cmx/cmxa if no ocaml native
> compiler
>
>so add checking in spec file
>to conditionnaly build related rpms
>
>Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
>
>diff --git a/hivex.spec b/hivex.spec
>index f6ab67a..a856ed1 100644
>--- a/hivex.spec
>+++ b/hivex.spec
>@@ -4,6 +4,7 @@
> %else
> %bcond_without ocaml
> %endif
>+%global optocaml %(which ocamlopt >/dev/null 2>&1 && echo 1 || echo 0)
> 
> Name:           hivex
> Version:        1.3.9
>@@ -229,8 +230,10 @@ rm $RPM_BUILD_ROOT%{python_sitearch}/libhivexmod.la
> %doc README
> %{_libdir}/ocaml/hivex
> %exclude %{_libdir}/ocaml/hivex/*.a
>+%if %optocaml
> %exclude %{_libdir}/ocaml/hivex/*.cmxa
> %exclude %{_libdir}/ocaml/hivex/*.cmx
>+%endif
> %exclude %{_libdir}/ocaml/hivex/*.mli
> %{_libdir}/ocaml/stublibs/*.so
> %{_libdir}/ocaml/stublibs/*.so.owner
>@@ -238,8 +241,10 @@ rm $RPM_BUILD_ROOT%{python_sitearch}/libhivexmod.la
> 
> %files -n ocaml-%{name}-devel
> %{_libdir}/ocaml/hivex/*.a
>+%if %optocaml
> %{_libdir}/ocaml/hivex/*.cmxa
> %{_libdir}/ocaml/hivex/*.cmx
>+%endif
> %{_libdir}/ocaml/hivex/*.mli
> %endif
>

Actions: View | Diff

Attachments on bug 1077869: 876061