From ba170b71d9e352148477123a6db059f307252a2e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 5 Dec 2008 17:14:25 +0000 Subject: [PATCH] Patch to fix stricter -output-obj checks in OCaml 3.11.0. --- cil-1.3.6-output-obj.patch | 13 +++++++++++++ ocaml-cil.spec | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 cil-1.3.6-output-obj.patch diff --git a/cil-1.3.6-output-obj.patch b/cil-1.3.6-output-obj.patch new file mode 100644 index 0000000..53f8dd8 --- /dev/null +++ b/cil-1.3.6-output-obj.patch @@ -0,0 +1,13 @@ +--- cil.orig/Makefile.in 2007-02-05 21:10:29.000000000 +0000 ++++ cil/Makefile.in 2008-12-05 17:03:59.000000000 +0000 +@@ -273,7 +273,9 @@ + ifeq ($(NATIVECAML),1) + $(OBJDIR)/libcil.a: $(OCAML_CIL_LIB_CMODULES:%=$(OBJDIR)/lib%.a) \ + $(OCAML_CIL_LIB_MODULES:%=$(OBJDIR)/%.$(CMO)) +- ocamlopt -output-obj -o $@ $(CILLY_LIBS:%=%.cmxa) $^ ++ ocamlopt -output-obj -o tmpcil.o $(CILLY_LIBS:%=%.cmxa) $^ ++ ar rcs $@ tmpcil.o ++ rm -f tmpcil.o + else + $(OBJDIR)/libcil.a: + @echo "Can only build $@ when NATIVECAML is 1." diff --git a/ocaml-cil.spec b/ocaml-cil.spec index fd42eca..c97409e 100644 --- a/ocaml-cil.spec +++ b/ocaml-cil.spec @@ -6,7 +6,7 @@ Name: ocaml-cil Version: 1.3.6 -Release: 8%{?dist} +Release: 9%{?dist} Summary: CIL - Infrastructure for C Program Analysis and Transformation Group: Development/Libraries @@ -17,6 +17,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: ppc64 ExcludeArch: ppc +Patch0: cil-1.3.6-output-obj.patch + BuildRequires: ocaml, ocaml-findlib-devel, ocaml-ocamldoc %define _use_internal_dependency_generator 0 @@ -87,6 +89,7 @@ for gcc. %prep %setup -q -n cil +%patch0 -p1 ./configure --libdir=%{_libdir} @@ -190,6 +193,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Dec 5 2008 Richard W.M. Jones - 1.3.6-9 +- Patch to fix stricter -output-obj checks in OCaml 3.11.0. + * Wed Nov 19 2008 Richard W.M. Jones - 1.3.6-8 - Rebuild for OCaml 3.11.0