From 72f1fc369f5de19909f3f6e7d0fe495265e25da8 Mon Sep 17 00:00:00 2001 From: Richard W.M. Jones Date: Jun 20 2018 19:41:34 +0000 Subject: Add patch to fix "naked" line directive for OCaml 4.07. --- diff --git a/bin_prot-2.0.9-fix-line-directive.patch b/bin_prot-2.0.9-fix-line-directive.patch new file mode 100644 index 0000000..bd0066c --- /dev/null +++ b/bin_prot-2.0.9-fix-line-directive.patch @@ -0,0 +1,11 @@ +--- bin_prot-2.0.9.old/myocamlbuild.ml 2018-06-20 20:39:23.831032731 +0100 ++++ bin_prot-2.0.9/myocamlbuild.ml 2018-06-20 20:39:59.613139344 +0100 +@@ -471,7 +471,7 @@ + + # 473 "myocamlbuild.ml" + (* OASIS_STOP *) +-# 465 myocamlbuild.ml ++# 465 "myocamlbuild.ml" + + (* We probably will want to set this up in the `configure` script at some + point.*) diff --git a/ocaml-bin-prot.spec b/ocaml-bin-prot.spec index f4d4e0f..2d3ac54 100644 --- a/ocaml-bin-prot.spec +++ b/ocaml-bin-prot.spec @@ -20,6 +20,9 @@ Patch2: %{name}-2.0.9-fix-ints.patch # Safe-string fixes for OCaml 4.06. Patch3: bin-prot-2.0.9-safe-string.patch +# Fix "naked" line directive for OCaml 4.07. +Patch4: bin_prot-2.0.9-fix-line-directive.patch + BuildRequires: ocaml >= 3.12.0 BuildRequires: ocaml-ocamlbuild BuildRequires: ocaml-findlib-devel @@ -59,6 +62,7 @@ developing applications that use %{name}. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # Use Fedora CFLAGS, and define ARCH_INT64_TYPE expr=' "-DARCH_INT64_TYPE";'