Fix building on Perl 5.26

This commit is contained in:
Jitka Plesnikova 2017-05-22 16:02:41 +02:00
parent 75168a5487
commit 24c5fb41cb
2 changed files with 29 additions and 1 deletions

View File

@ -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;

View File

@ -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 <jplesnik@redhat.com> - 1.7.3-31
- Fix unescaped left brace in regex
* Sat May 13 2017 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-30
- OCaml 4.04.1 rebuild.