OCaml 4.12.0 build

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

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;

cil-1.7.3-bytecode-compilation.patch

@@ -0,0 +1,11 @@
+--- cil-1.7.3/myocamlbuild.ml.orig	2015-07-20 12:56:57.224597528 +0100
++++ cil-1.7.3/myocamlbuild.ml	2015-07-20 12:57:04.742605963 +0100
+@@ -8,7 +8,7 @@
+   let dirs = include_dirs_of (dirname mllib) in
+   let modules = string_list_of_file mllib in
+   let make_candidates m =
+-    List.map (expand_module dirs m) [["cmi"]; ["cmx"]; ["mli"; "inferred.mli"]] in
++    List.map (expand_module dirs m) [["cmi"]; ["cmo"]; ["mli"; "inferred.mli"]] in
+   let dependencies = List.flatten (List.map make_candidates modules) in
+   let build_result = builder dependencies in
+   let built_files = List.filter_opt

cil-1.7.3-enable-ocamlopt-g.patch

@@ -4,4 +4,4 @@
  "test": not_hygienic
  # build every cmo in debug mode (for cil.cma)
  <**/*.cmo>: debug
-+<**/*.cmx>: debug
++true: debug

cil-1.7.3-gcc-7.patch

@@ -0,0 +1,11 @@
+--- cil-1.7.3/lib/App/Cilly.pm.in	2013-07-24 16:07:11.000000000 +0100
++++ cil-1.7.3.new/lib/App/Cilly.pm.in	2017-02-14 13:02:52.517194526 +0000
+@@ -2220,7 +2220,7 @@
+          . join(' ', @{$self->{PPARGS}}) ." |") 
+         || die "Cannot start GNUCC";
+     while(<VER>) {
+-        if($_ =~ m|^(\d+\S+)| || $_ =~ m|^(egcs-\d+\S+)|) {
++        if($_ =~ m|^(\d+\S+)| || $_ =~ m|^(\d+)$| || $_ =~ m|^(egcs-\d+\S+)|) {
+             $cversion = "gcc_$1";
+             close(VER) || die "Cannot start GNUCC\n";
+             $self->{CVERSION} = $cversion;

cil-1.7.3-safe-string.patch

@@ -0,0 +1,120 @@
+diff -ur cil-1.7.3.old/ocamlutil/errormsg.ml cil-1.7.3/ocamlutil/errormsg.ml
+--- cil-1.7.3.old/ocamlutil/errormsg.ml	2013-07-24 16:07:11.000000000 +0100
++++ cil-1.7.3/ocamlutil/errormsg.ml	2017-11-22 14:55:09.549734942 +0000
+@@ -210,23 +210,24 @@
+   let str1 = 
+     if str <> "" && String.get str 0 = '"' (* '"' ( *) 
+     then rem_quotes str else str in
+-  let l = String.length str1 in
++  let str1 = Bytes.of_string str1 in
++  let l = Bytes.length str1 in
+   let rec loop (copyto: int) (i: int) = 
+     if i >= l then 
+-      String.sub str1 0 copyto
++      Bytes.sub str1 0 copyto
+      else 
+-       let c = String.get str1 i in
++       let c = Bytes.get str1 i in
+        if c <> '\\' then begin
+-          String.set str1 copyto c; loop (copyto + 1) (i + 1)
++          Bytes.set str1 copyto c; loop (copyto + 1) (i + 1)
+        end else begin
+-          String.set str1 copyto '/';
+-          if i < l - 2 && String.get str1 (i + 1) = '\\' then
++          Bytes.set str1 copyto '/';
++          if i < l - 2 && Bytes.get str1 (i + 1) = '\\' then
+               loop (copyto + 1) (i + 2)
+           else 
+               loop (copyto + 1) (i + 1)
+        end
+   in
+-  loop 0 0
++  Bytes.to_string (loop 0 0)
+ 
+ let readingFromStdin = ref false
+ 
+diff -ur cil-1.7.3.old/ocamlutil/pretty.ml cil-1.7.3/ocamlutil/pretty.ml
+--- cil-1.7.3.old/ocamlutil/pretty.ml	2017-11-22 13:17:54.112327112 +0000
++++ cil-1.7.3/ocamlutil/pretty.ml	2017-11-22 14:56:24.658729757 +0000
+@@ -725,8 +725,9 @@
+               invalid_arg ("dprintf: unimplemented format " 
+ 			   ^ (String.sub format i (j-i+1)));
+ 	    let j' = succ j in (* eat the d,i,x etc. *)
+-	    let format_spec = "% " in
+-	    String.set format_spec 1 (fget j'); (* format_spec = "%x", etc. *)
++	    let format_spec = Bytes.of_string "% " in
++	    Bytes.set format_spec 1 (fget j'); (* format_spec = "%x", etc. *)
++            let format_spec = Bytes.to_string format_spec in
+             Obj.magic(fun n ->
+               collect (dctext1 acc
+                          (Int64.format format_spec n))
+@@ -735,8 +736,9 @@
+ 	    if j != i + 1 then invalid_arg ("dprintf: unimplemented format " 
+ 					    ^ (String.sub format i (j-i+1)));
+ 	    let j' = succ j in (* eat the d,i,x etc. *)
+-	    let format_spec = "% " in
+-	    String.set format_spec 1 (fget j'); (* format_spec = "%x", etc. *)
++	    let format_spec = Bytes.of_string "% " in
++	    Bytes.set format_spec 1 (fget j'); (* format_spec = "%x", etc. *)
++            let format_spec = Bytes.to_string format_spec in
+             Obj.magic(fun n ->
+               collect (dctext1 acc
+                          (Int32.format format_spec n))
+@@ -745,8 +747,9 @@
+ 	    if j != i + 1 then invalid_arg ("dprintf: unimplemented format " 
+ 					    ^ (String.sub format i (j-i+1)));
+ 	    let j' = succ j in (* eat the d,i,x etc. *)
+-	    let format_spec = "% " in
+-	    String.set format_spec 1 (fget j'); (* format_spec = "%x", etc. *)
++	    let format_spec = Bytes.of_string "% " in
++	    Bytes.set format_spec 1 (fget j'); (* format_spec = "%x", etc. *)
++            let format_spec = Bytes.to_string format_spec in
+             Obj.magic(fun n ->
+               collect (dctext1 acc
+                          (Nativeint.format format_spec n))
+diff -ur cil-1.7.3.old/src/cil.ml cil-1.7.3/src/cil.ml
+--- cil-1.7.3.old/src/cil.ml	2013-07-24 16:07:11.000000000 +0100
++++ cil-1.7.3/src/cil.ml	2017-11-22 14:53:42.922740924 +0000
+@@ -5033,19 +5033,19 @@
+ (* Take the name of a file and make a valid symbol name out of it. There are 
+  * a few characters that are not valid in symbols *)
+ let makeValidSymbolName (s: string) = 
+-  let s = String.copy s in (* So that we can update in place *)
+-  let l = String.length s in
++  let s = Bytes.of_string s in (* So that we can update in place *)
++  let l = Bytes.length s in
+   for i = 0 to l - 1 do
+-    let c = String.get s i in
++    let c = Bytes.get s i in
+     let isinvalid = 
+       match c with
+         '-' | '.' -> true
+       | _ -> false
+     in
+     if isinvalid then 
+-      String.set s i '_';
++      Bytes.set s i '_';
+   done;
+-  s
++  Bytes.to_string s
+ 
+ let rec addOffset (toadd: offset) (off: offset) : offset =
+   match off with
+diff -ur cil-1.7.3.old/src/formatlex.mll cil-1.7.3/src/formatlex.mll
+--- cil-1.7.3.old/src/formatlex.mll	2013-07-24 16:07:11.000000000 +0100
++++ cil-1.7.3/src/formatlex.mll	2017-11-22 14:52:59.217743941 +0000
+@@ -145,11 +145,11 @@
+  * We convert L"Hi" to "H\000i\000" *)
+ let wbtowc wstr =
+   let len = String.length wstr in 
+-  let dest = String.make (len * 2) '\000' in 
++  let dest = Bytes.make (len * 2) '\000' in 
+   for i = 0 to len-1 do 
+-    dest.[i*2] <- wstr.[i] ;
++    Bytes.set dest (i*2) wstr.[i] ;
+   done ;
+-  dest
++  Bytes.to_string dest
+ 
+ (* This function converst the "Hi" in L"Hi" to { L'H', L'i', L'\0' } *)
+ let wstr_to_warray wstr =

ocaml-cil.spec

@@ -1,20 +1,21 @@
-%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
+# Disable debuginfo because I cannot get -g passed to ocamlopt -a
+%global debug_package %{nil}
 
 Name:           ocaml-cil
 Version:        1.7.3
-Release:        14%{?dist}
+Release:        67%{?dist}
 Summary:        CIL - Infrastructure for C Program Analysis and Transformation
 License:        BSD
 
-URL:            http://cil.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/cil/cil-%{version}.tar.gz
+URL:            https://github.com/cil-project/cil
+Source0:        https://github.com/cil-project/cil/archive/cil-%{version}.tar.gz
 
-# RHBZ#994968
-ExcludeArch:    armv7hl
-ExcludeArch:    sparc64
-ExcludeArch:    s390 s390x
-
-BuildRequires:  ocaml, ocaml-findlib-devel, ocaml-ocamldoc
+BuildRequires: make
+BuildRequires:  ocaml
+BuildRequires:  ocaml-ocamlbuild
+BuildRequires:  ocaml-findlib-devel
+BuildRequires:  ocaml-ocamldoc
+BuildRequires:  ocaml-num-devel
 
 Patch0:         0001-Fix-testsuite-on-32-bit-machines.patch
 Patch1:         0002-Do-not-fail-testsuite-on-new-gcc-behaviour.patch
@@ -30,6 +31,19 @@ Patch3:         cil-1.7.3-add-package-cilconfig.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1120273
 Patch4:         ocaml-4.02.0.patch
 
+# Fix for bytecode compilation (only apply this when !opt).
+Patch5:         cil-1.7.3-bytecode-compilation.patch
+
+# Fix compilation with GCC 7.
+# 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
+
+# Fixes for -safe-string in OCaml 4.06.
+Patch8:         cil-1.7.3-safe-string.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
@@ -83,6 +97,7 @@ Summary:        Support programs for %{name}
 Requires:       %{name} = %{version}-%{release}
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 # test and doc use cilly: Requires must also be BuildRequires
+BuildRequires:  perl-generators
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(Data::Dumper)
 BuildRequires:  perl(File::Basename)
@@ -112,6 +127,12 @@ for gcc.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%ifnarch %{ocaml_native_compiler}
+%patch5 -p1
+%endif
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %build
 
@@ -125,7 +146,8 @@ make all doc
 make OCAMLBEST= bin/cilly.byte
 
 %check
-make test
+# Test suite is advisory.  Even upstream it does not work fully.
+make test ||:
 
 %install
 
@@ -144,19 +166,16 @@ find $DESTDIR -name .packlist -type f -exec rm -f {} \;
 mkdir -p doc/ocaml-cil/html
 cp -r doc/html/cil/api doc/ocaml-cil/html
 cp -r doc/html/cil/examples doc/ocaml-cil/html
-cp doc/html/cil/*.gif doc/ocaml-cil/html/
 cp doc/html/cil/*.html doc/ocaml-cil/html/
 cp doc/html/cil/*.css doc/ocaml-cil/html/
+cp doc/html/cil/*.svg doc/ocaml-cil/html/
 cp doc/html/cil/CIL.pdf doc/ocaml-cil/cil-manual.pdf
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 
 %files
 %doc README.md LICENSE
 %{_libdir}/ocaml/cil
-%if %opt
+%ifarch %{ocaml_native_compiler}
 %exclude %{_libdir}/ocaml/cil/*.a
 %exclude %{_libdir}/ocaml/cil/*.cmxa
 %exclude %{_libdir}/ocaml/cil/*.cmx
@@ -166,7 +185,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %doc README.md LICENSE
-%if %opt
+%ifarch %{ocaml_native_compiler}
 %{_libdir}/ocaml/cil/*.a
 %{_libdir}/ocaml/cil/*.cmxa
 %{_libdir}/ocaml/cil/*.cmx
@@ -186,6 +205,168 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Mar  1 17:26:07 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-67
+- OCaml 4.12.0 build
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-66
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-65
+- OCaml 4.11.1 rebuild
+
+* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-64
+- OCaml 4.11.0 rebuild
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-63
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-62
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jun 25 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.7.3-61
+- Perl 5.32 rebuild
+
+* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-60
+- OCaml 4.11.0+dev2-2020-04-22 rebuild
+
+* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-59
+- OCaml 4.11.0 pre-release attempt 2
+
+* Fri Apr 17 2020 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-58
+- OCaml 4.11.0 pre-release
+
+* Fri Apr 03 2020 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-57
+- Update all OCaml dependencies for RPM 4.16.
+
+* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-56
+- OCaml 4.10.0 final.
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-55
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-54
+- OCaml 4.10.0+beta1 rebuild.
+
+* Fri Dec 06 2019 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-53
+- OCaml 4.09.0 (final) rebuild.
+
+* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-52
+- OCaml 4.08.1 (final) rebuild.
+
+* Wed Jul 31 2019 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-51
+- OCaml 4.08.1 (rc2) rebuild.
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-50
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jun 27 2019 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-49
+- OCaml 4.08.0 (final) rebuild.
+
+* Sat Jun 01 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.7.3-48
+- Perl 5.30 rebuild
+
+* Mon Apr 29 2019 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-47
+- OCaml 4.08.0 (beta 3) rebuild.
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-46
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Jan 08 2019 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-45
+- hevea now generates *.svg instead of *.gif (RHBZ#1664307).
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-44
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Jul 11 2018 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-43
+- OCaml 4.07.0 (final) rebuild.
+
+* Fri Jun 29 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1.7.3-42
+- Perl 5.28 rebuild
+
+* Wed Jun 20 2018 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-41
+- OCaml 4.07.0-rc1 rebuild.
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-40
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Nov 22 2017 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-39
+- OCaml 4.06.0 rebuild.
+- Fixes for -safe-string.
+- Stop using opt macro.
+- Enable debuginfo on all architectures.
+
+* Tue Aug 08 2017 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-38
+- OCaml 4.05.0 rebuild.
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-37
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-36
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Jun 27 2017 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-35
+- OCaml 4.04.2 rebuild.
+
+* Wed Jun 07 2017 Jitka Plesnikova <jplesnik@redhat.com> - 1.7.3-34
+- Perl 5.26 re-rebuild of bootstrapped packages
+
+* Wed Jun 07 2017 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-33
+- Rebuild against ocamlfind 1.7.3.
+
+* Sun Jun 04 2017 Jitka Plesnikova <jplesnik@redhat.com> - 1.7.3-32
+- Perl 5.26 rebuild
+
+* 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.
+
+* Tue Feb 14 2017 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-29
+- Fix compilation with GCC 7.
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-28
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Mon Nov 07 2016 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-27
+- Rebuild for OCaml 4.04.0.
+- Add explicit dependency on ocamlbuild.
+
+* Wed Oct 19 2016 Dan Horák <dan[at]danny.cz> - 1.7.3-26
+- disable debuginfo subpackage on interpreted builds
+
+* Tue May 17 2016 Jitka Plesnikova <jplesnik@redhat.com> - 1.7.3-25
+- Perl 5.24 rebuild
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Jul 28 2015 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-23
+- OCaml 4.02.3 rebuild.
+
+* Mon Jul 20 2015 Richard W.M. Jones <rjones@redhat.com> 1.7.3-22
+- Add patch for bytecode compilation, and enable on all arches.
+
+* Mon Jun 29 2015 Peter Robinson <pbrobinson@fedoraproject.org> 1.7.3-21
+- Build on ARMv7 (rhbz 994968) as it seems to now be fixed
+
+* Wed Jun 24 2015 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-20
+- ocaml-4.02.2 final rebuild.
+
+* Thu Jun 18 2015 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-19
+- ocaml-4.02.2 rebuild.
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.3-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat Jun 06 2015 Jitka Plesnikova <jplesnik@redhat.com> - 1.7.3-17
+- Perl 5.22 rebuild
+
+* Tue Feb 17 2015 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-16
+- ocaml-4.02.1 rebuild.
+- Make test suite advisory.  Even upstream it does not work fully.
+
 * Wed Sep 03 2014 Jitka Plesnikova <jplesnik@redhat.com> - 1.7.3-14
 - Perl 5.20 rebuild