Unclear still why this is failing to build .. try building image_intf.cmi

explicitly.
This commit is contained in:
Richard W.M. Jones 2010-02-16 16:08:13 +00:00
parent 91ee426a7c
commit a70c70e4fd
2 changed files with 10 additions and 19 deletions

View File

@ -1,12 +0,0 @@
--- camlimages-3.0.2.orig/src/Makefile.am 2009-10-26 12:42:03.000000000 +0000
+++ camlimages-3.0.2/src/Makefile.am 2010-02-16 15:51:39.815603366 +0000
@@ -91,7 +91,8 @@
xvthumb.mli \
oXvthumb.mli \
colorhist.mli \
- geometry.mli
+ geometry.mli \
+ image_intf.mli
CSOURCES_CORE =

View File

@ -4,7 +4,7 @@
Name: ocaml-camlimages
Version: 3.0.2
Release: 4%{?dist}
Release: 6%{?dist}
Summary: OCaml image processing library
Group: Development/Libraries
@ -30,10 +30,6 @@ Patch2: camlimages-oversized-tiff-check-CVE-2009-3296.patch
# macros.
Patch3: camlimages-3.0.2-ocaml-autoconf.patch
# image_intf.mli is not declared anywhere in the Makefile.
# NOT upstream.
Patch4: camlimages-3.0.2-add-image_intf.patch
BuildRequires: ocaml >= 3.10.1
BuildRequires: ocaml-lablgtk-devel
BuildRequires: ocaml-x11
@ -81,7 +77,6 @@ Includes documentation provided by ocamldoc
%patch0 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
aclocal -I .
automake
autoconf
@ -90,6 +85,14 @@ mv examples/liv/display.ml examples/liv/livdisplay.ml
%build
%configure
# Hack: unclear why this is necessary, but the file image_intf
# is not mentioned in the Makefile.
make ||:
pushd src
ocamlc -I +lablgtk2 -c image_intf.mli
popd
make
@ -128,7 +131,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Jan 12 2010 Richard W.M. Jones <rjones@redhat.com> - 3.0.2-4
* Wed Jan 12 2010 Richard W.M. Jones <rjones@redhat.com> - 3.0.2-6
- Fix FTBFS RHBZ#564798.
* Wed Jan 12 2010 Richard W.M. Jones <rjones@redhat.com> - 3.0.2-2