Kill -warn-error A so we can build on OCaml 4.02.
This doesn't fix all the build problems. The next one is that both <caml/config.h> and <tiffio.h> define a type called 'int64'. I'm going to bother OCaml upstream about this and try to get it fixed, but even if successful that will take a long time.
This commit is contained in:
parent
13cdb41bde
commit
2ae1afb4d4
11
ocaml-camlimages-4.1.0-kill-warn-error.patch
Normal file
11
ocaml-camlimages-4.1.0-kill-warn-error.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- camlspotter-camlimages-668faa3494fe.old/OMakefile 2014-08-19 18:37:14.405009781 +0100
|
||||
+++ camlspotter-camlimages-668faa3494fe/OMakefile 2014-08-19 18:37:55.930019935 +0100
|
||||
@@ -12,6 +12,8 @@
|
||||
# #
|
||||
#*********************************************************************#
|
||||
|
||||
+OCAMLFLAGS =
|
||||
+
|
||||
include OMyMakeroot
|
||||
|
||||
########################################## External arguments
|
@ -1,6 +1,6 @@
|
||||
Name: ocaml-camlimages
|
||||
Version: 4.1.0
|
||||
Release: 6%{?dist}
|
||||
Release: 7%{?dist}
|
||||
Summary: OCaml image processing library
|
||||
|
||||
Group: Development/Libraries
|
||||
@ -17,6 +17,9 @@ Source1: camlimages-2.2.0-htmlref.tar.gz
|
||||
# https://bitbucket.org/camlspotter/camlimages/issue/9
|
||||
Patch0: ocaml-camlimages-4.1.0-exifcheck.patch
|
||||
|
||||
# Kill -warn-error A so we can build on OCaml 4.02.
|
||||
Patch1: ocaml-camlimages-4.1.0-kill-warn-error.patch
|
||||
|
||||
BuildRequires: ocaml, ocaml-findlib-devel, ocaml-omake
|
||||
BuildRequires: ocaml-lablgtk-devel
|
||||
BuildRequires: ocaml-x11, xorg-x11-server-utils
|
||||
@ -50,6 +53,7 @@ Includes documentation provided by ocamldoc
|
||||
%setup -q -n camlspotter-camlimages-668faa3494fe
|
||||
%setup -q -T -D -a 1 -n camlspotter-camlimages-668faa3494fe
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
omake CFLAGS="$RPM_OPT_FLAGS"
|
||||
@ -86,6 +90,9 @@ cp -pr License.txt htmlref $RPM_BUILD_ROOT/usr/share/doc/ocaml-camlimages
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Aug 19 2014 Richard W.M. Jones <rjones@redhat.com> - 4.1.0-7
|
||||
- Kill -warn-error A so we can build on OCaml 4.02.
|
||||
|
||||
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.0-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user