From 24c5fb41cb6f3480326446eff909a190f561d674 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 22 May 2017 16:02:41 +0200 Subject: [PATCH] Fix building on Perl 5.26 --- ....3-Fix-unescaped-left-brace-in-regex.patch | 21 +++++++++++++++++++ ocaml-cil.spec | 9 +++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 cil-1.7.3-Fix-unescaped-left-brace-in-regex.patch diff --git a/cil-1.7.3-Fix-unescaped-left-brace-in-regex.patch b/cil-1.7.3-Fix-unescaped-left-brace-in-regex.patch new file mode 100644 index 0000000..fb818c6 --- /dev/null +++ b/cil-1.7.3-Fix-unescaped-left-brace-in-regex.patch @@ -0,0 +1,21 @@ +diff -up cil-1.7.3/doc/cilcode.pl.orig cil-1.7.3/doc/cilcode.pl +--- cil-1.7.3/doc/cilcode.pl.orig 2017-05-22 15:52:31.539144084 +0200 ++++ cil-1.7.3/doc/cilcode.pl 2017-05-22 15:53:22.750818950 +0200 +@@ -45,7 +45,7 @@ binmode STDOUT; + my $lineno = 0; + while(<>) { + $lineno ++; +- if(! $incode && $_ =~ m|^\\begin{cilcode}\[(.*)\](.*)$|) { ++ if(! $incode && $_ =~ m|^\\begin\{cilcode}\[(.*)\](.*)$|) { + $opt = $1; + $cil_options = $2; + $incode = 1; +@@ -60,7 +60,7 @@ while(<>) { + print "\\begin{code}\n"; + next; + } +- if($incode && $_ =~ m|^\\end{cilcode}$|) { ++ if($incode && $_ =~ m|^\\end\{cilcode}$|) { + $incode = 0; + if($opt eq 'local') { + print TSTSRC $postambleLocal; diff --git a/ocaml-cil.spec b/ocaml-cil.spec index 09c3b4a..0bd7658 100644 --- a/ocaml-cil.spec +++ b/ocaml-cil.spec @@ -5,7 +5,7 @@ Name: ocaml-cil Version: 1.7.3 -Release: 30%{?dist} +Release: 31%{?dist} Summary: CIL - Infrastructure for C Program Analysis and Transformation License: BSD @@ -38,6 +38,9 @@ Patch5: cil-1.7.3-bytecode-compilation.patch # gcc -dumpversion prints just "7", adjust the regex accordingly. Patch6: cil-1.7.3-gcc-7.patch +# Fix unescaped left brace in regex +Patch7: cil-1.7.3-Fix-unescaped-left-brace-in-regex.patch + %description CIL (C Intermediate Language) is a high-level representation along with a set of tools that permit easy analysis and source-to-source @@ -125,6 +128,7 @@ for gcc. %patch5 -p1 %endif %patch6 -p1 +%patch7 -p1 %build @@ -200,6 +204,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 22 2017 Jitka Plesnikova - 1.7.3-31 +- Fix unescaped left brace in regex + * Sat May 13 2017 Richard W.M. Jones - 1.7.3-30 - OCaml 4.04.1 rebuild.