rpms/hivex
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add upstream patch to fix OCaml tests.

Browse Source
This commit is contained in:
Richard W.M. Jones 2011-05-12 12:28:50 +01:00
parent f796c3682d
commit ccc8f899a2
2 changed files with 116 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
0001-ocaml-Use-libtool-to-get-correct-library-to-build-OC.patch Normal file
View File

@ -0,0 +1,109 @@
From 998387cf570a4569b9cdcb22f59aa7c979876fa6 Mon Sep 17 00:00:00 2001
From: Hilko Bengen <bengen@hilluzination.de>
Date: Thu, 12 May 2011 12:25:21 +0100
Subject: [PATCH] ocaml: Use libtool to get correct library to build OCaml
tests.
See this thread:
https://www.redhat.com/archives/libguestfs/2011-May/thread.html#00015
---
ocaml/Makefile.am | 37 +++++--------------------------------
1 files changed, 5 insertions(+), 32 deletions(-)
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
index fee3b88..e61b5db 100644
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -63,38 +63,11 @@ TESTS = \
t/hivex_300_fold
noinst_DATA += $(TESTS)
-t/hivex_005_load: t/hivex_005_load.cmo mlhivex.cma
- mkdir -p t
- $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@
-
-t/hivex_010_open: t/hivex_010_open.cmo mlhivex.cma
- mkdir -p t
- $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@
-
-t/hivex_020_root: t/hivex_020_root.cmo mlhivex.cma
- mkdir -p t
- $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@
-
-t/hivex_100_errors: t/hivex_100_errors.cmo mlhivex.cma
- mkdir -p t
- $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@
-
-t/hivex_110_gc_handle: t/hivex_110_gc_handle.cmo mlhivex.cma
- mkdir -p t
- $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@
-
-t/hivex_200_write: t/hivex_200_write.cmo mlhivex.cma
- mkdir -p t
- $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@
-
-t/hivex_300_fold: t/hivex_300_fold.cmo mlhivex.cma
- mkdir -p t
- $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@
-
-# Need to rebuild the tests from source if the main library has
-# changed at all, otherwise we get inconsistent assumptions.
-t/%.cmx: t/%.ml mlhivex.cmxa
- $(OCAMLFIND) ocamlopt -package unix -linkpkg -c $< -o $@
+# https://www.redhat.com/archives/libguestfs/2011-May/thread.html#00015
+t/%: t/%.cmo mlhivex.cma
+ $(LIBTOOL) --mode=execute -dlopen $(top_builddir)/lib/libhivex.la \
+ $(OCAMLFIND) ocamlc -dllpath $(abs_builddir) -package unix \
+ -linkpkg mlhivex.cma $< -o $@
.mli.cmi:
$(OCAMLFIND) ocamlc -package unix -c $< -o $@
--
1.7.5
--- hivex/ocaml/Makefile.in.orig 2011-05-12 12:26:46.451011976 +0100
+++ hivex/ocaml/Makefile.in 2011-05-12 12:26:56.623195014 +0100
@@ -1188,38 +1188,11 @@
@HAVE_OCAML_TRUE@hivex_c.o: hivex_c.c
@HAVE_OCAML_TRUE@ $(CC) $(AM_CPPFLAGS) $(CFLAGS) -fPIC -Wall -c $<
-@HAVE_OCAML_TRUE@t/hivex_005_load: t/hivex_005_load.cmo mlhivex.cma
-@HAVE_OCAML_TRUE@ mkdir -p t
-@HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@
-
-@HAVE_OCAML_TRUE@t/hivex_010_open: t/hivex_010_open.cmo mlhivex.cma
-@HAVE_OCAML_TRUE@ mkdir -p t
-@HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@
-
-@HAVE_OCAML_TRUE@t/hivex_020_root: t/hivex_020_root.cmo mlhivex.cma
-@HAVE_OCAML_TRUE@ mkdir -p t
-@HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@
-
-@HAVE_OCAML_TRUE@t/hivex_100_errors: t/hivex_100_errors.cmo mlhivex.cma
-@HAVE_OCAML_TRUE@ mkdir -p t
-@HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@
-
-@HAVE_OCAML_TRUE@t/hivex_110_gc_handle: t/hivex_110_gc_handle.cmo mlhivex.cma
-@HAVE_OCAML_TRUE@ mkdir -p t
-@HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@
-
-@HAVE_OCAML_TRUE@t/hivex_200_write: t/hivex_200_write.cmo mlhivex.cma
-@HAVE_OCAML_TRUE@ mkdir -p t
-@HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@
-
-@HAVE_OCAML_TRUE@t/hivex_300_fold: t/hivex_300_fold.cmo mlhivex.cma
-@HAVE_OCAML_TRUE@ mkdir -p t
-@HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@
-
-# Need to rebuild the tests from source if the main library has
-# changed at all, otherwise we get inconsistent assumptions.
-@HAVE_OCAML_TRUE@t/%.cmx: t/%.ml mlhivex.cmxa
-@HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlopt -package unix -linkpkg -c $< -o $@
+# https://www.redhat.com/archives/libguestfs/2011-May/thread.html#00015
+@HAVE_OCAML_TRUE@t/%: t/%.cmo mlhivex.cma
+@HAVE_OCAML_TRUE@ $(LIBTOOL) --mode=execute -dlopen $(top_builddir)/lib/libhivex.la \
+@HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlc -dllpath $(abs_builddir) -package unix \
+@HAVE_OCAML_TRUE@ -linkpkg mlhivex.cma $< -o $@
@HAVE_OCAML_TRUE@.mli.cmi:
@HAVE_OCAML_TRUE@ $(OCAMLFIND) ocamlc -package unix -c $< -o $@

9
hivex.spec
View File

@ -7,7 +7,7 @@
Name: hivex Name: hivex
Version: 1.2.6 Version: 1.2.6
Release: 1%{?dist} Release: 2%{?dist}
Summary: Read and write Windows Registry binary hive files Summary: Read and write Windows Registry binary hive files
Group: Development/Libraries Group: Development/Libraries
@ -38,6 +38,9 @@ Conflicts: libguestfs <= 1:1.0.84
# Fix Perl directory install path. # Fix Perl directory install path.
Patch0: %{name}-1.2.3-dirs.patch Patch0: %{name}-1.2.3-dirs.patch
# Fix ocaml tests.
Patch1: 0001-ocaml-Use-libtool-to-get-correct-library-to-build-OC.patch
%description %description
Hive files are the undocumented binary blobs that Windows uses to Hive files are the undocumented binary blobs that Windows uses to
@ -144,6 +147,7 @@ python-%{name} contains Python bindings for %{name}.
%setup -q %setup -q
%patch0 -p1 -b .dirs %patch0 -p1 -b .dirs
%patch1 -p1
%build %build
@ -252,9 +256,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Thu May 12 2011 Richard W.M. Jones <rjones@redhat.com> - 1.2.6-1 * Thu May 12 2011 Richard W.M. Jones <rjones@redhat.com> - 1.2.6-2
- New upstream version 1.2.6. - New upstream version 1.2.6.
- Removed patch which is now upstream. - Removed patch which is now upstream.
- Add upstream patch to fix ocaml tests.
* Thu Apr 28 2011 Richard W.M. Jones <rjones@redhat.com> - 1.2.5-2 * Thu Apr 28 2011 Richard W.M. Jones <rjones@redhat.com> - 1.2.5-2
- Fix Python bindings on 32 bit arch with upstream patch. - Fix Python bindings on 32 bit arch with upstream patch.