From 24be06ac84386daca52df8639b2e778fe7d62a10 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 18 Aug 2014 10:03:21 +0100 Subject: [PATCH] Kill -warn-error option that caused failure to build on OCaml 4.02. --- ocaml-omake.spec | 7 ++++++- omake-0.9.8.6-kill-warn-error.patch | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 omake-0.9.8.6-kill-warn-error.patch diff --git a/ocaml-omake.spec b/ocaml-omake.spec index fd9c46d..1ceb9b9 100644 --- a/ocaml-omake.spec +++ b/ocaml-omake.spec @@ -1,6 +1,6 @@ Name: ocaml-omake Version: 0.9.8.6 -Release: 0.rc1%{?dist}.12 +Release: 0.rc1%{?dist}.13 Summary: Build system with automated dependency analysis License: LGPLv2+ with exceptions and GPLv2+ and BSD @@ -11,6 +11,7 @@ ExcludeArch: sparc64 s390 s390x Patch0: omake-debian-disable-ocaml-warnings.patch Patch1: omake-0.9.8.6-fix-and-or-operators.patch +Patch2: omake-0.9.8.6-kill-warn-error.patch # omake can be used on non-OCaml projects (RHBZ#548536). Provides: omake @@ -49,6 +50,7 @@ features many additional enhancements, including the following. %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build @@ -75,6 +77,9 @@ chmod 0755 $RPM_BUILD_ROOT%{_bindir}/* %changelog +* Mon Aug 18 2014 Richard W.M. Jones - 0.9.8.6-0.rc1.13 +- Kill -warn-error option that caused failure to build on OCaml 4.02. + * Sun Aug 17 2014 Fedora Release Engineering - 0.9.8.6-0.rc1.12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/omake-0.9.8.6-kill-warn-error.patch b/omake-0.9.8.6-kill-warn-error.patch new file mode 100644 index 0000000..b5d388d --- /dev/null +++ b/omake-0.9.8.6-kill-warn-error.patch @@ -0,0 +1,11 @@ +--- omake-0.9.8.6.old/lib/build/OCaml.om 2008-03-05 01:07:25.000000000 +0000 ++++ omake-0.9.8.6/lib/build/OCaml.om 2014-08-18 10:01:19.433742023 +0100 +@@ -176,7 +176,7 @@ + # + declare OCAMLDEPFLAGS + public.OCAMLPPFLAGS = +-public.OCAMLFLAGS = -warn-error A ++public.OCAMLFLAGS = + public.OCAMLCFLAGS = -g + public.OCAMLOPTFLAGS = + public.OCAMLCPPFLAGS =