From 19d7bd0be3b71c2fe2bd730adabc241d44e8bd65 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 10 Aug 2012 17:51:11 +0100 Subject: [PATCH] Change Debian patch to disable all compile warnings. --- ocaml-omake.spec | 7 +++++-- ...ings.patch => omake-debian-disable-ocaml-warnings.patch | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) rename omake-debian-disable-ocaml312-warnings.patch => omake-debian-disable-ocaml-warnings.patch (83%) diff --git a/ocaml-omake.spec b/ocaml-omake.spec index be4f08e..320810e 100644 --- a/ocaml-omake.spec +++ b/ocaml-omake.spec @@ -2,7 +2,7 @@ Name: ocaml-omake Version: 0.9.8.6 -Release: 0.rc1%{?dist}.4 +Release: 0.rc1%{?dist}.5 Summary: Build system with automated dependency analysis Group: Development/Tools @@ -12,7 +12,7 @@ Source0: http://omake.metaprl.org/downloads/omake-%{version}-0.rc1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: sparc64 s390 s390x -Patch0: omake-debian-disable-ocaml312-warnings.patch +Patch0: omake-debian-disable-ocaml-warnings.patch # omake can be used on non-OCaml projects (RHBZ#548536). Provides: omake @@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Aug 10 2012 Richard W.M. Jones - 0.9.8.6-0.rc1.4 +- Change Debian patch to disable all compile warnings. + * Fri Jul 20 2012 Fedora Release Engineering - 0.9.8.6-0.rc1.4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/omake-debian-disable-ocaml312-warnings.patch b/omake-debian-disable-ocaml-warnings.patch similarity index 83% rename from omake-debian-disable-ocaml312-warnings.patch rename to omake-debian-disable-ocaml-warnings.patch index dc8ef17..db6c4e5 100644 --- a/omake-debian-disable-ocaml312-warnings.patch +++ b/omake-debian-disable-ocaml-warnings.patch @@ -1,5 +1,7 @@ Patch by Stephane Glondu. +Modified by RWMJ to remove all warnings. + --- omake-0.9.8.6.old/OMakefile 2010-10-27 01:42:37.000000000 +0100 +++ omake-0.9.8.6/OMakefile 2011-01-05 14:33:42.170895298 +0000 @@ -57,7 +57,7 @@ @@ -7,7 +9,7 @@ Patch by Stephane Glondu. # OCaml options # -OCAMLFLAGS[] += -w Ae$(if $(OCAML_ACCEPTS_Z_WARNING), z) -+OCAMLFLAGS[] += -w Aer-29$(if $(OCAML_ACCEPTS_Z_WARNING), z) ++OCAMLFLAGS[] += if $(THREADS_ENABLED) OCAMLFLAGS += -thread export