Add patch for bytecode compilation, and enable on all arches.
This commit is contained in:
parent
2b1af4f36a
commit
5f118e88ca
|
@ -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
|
|
@ -2,15 +2,13 @@
|
||||||
|
|
||||||
Name: ocaml-cil
|
Name: ocaml-cil
|
||||||
Version: 1.7.3
|
Version: 1.7.3
|
||||||
Release: 21%{?dist}
|
Release: 22%{?dist}
|
||||||
Summary: CIL - Infrastructure for C Program Analysis and Transformation
|
Summary: CIL - Infrastructure for C Program Analysis and Transformation
|
||||||
License: BSD
|
License: BSD
|
||||||
|
|
||||||
URL: http://cil.sourceforge.net/
|
URL: http://cil.sourceforge.net/
|
||||||
Source0: http://downloads.sourceforge.net/cil/cil-%{version}.tar.gz
|
Source0: http://downloads.sourceforge.net/cil/cil-%{version}.tar.gz
|
||||||
|
|
||||||
ExcludeArch: sparc64 s390 s390x
|
|
||||||
|
|
||||||
BuildRequires: ocaml, ocaml-findlib-devel, ocaml-ocamldoc
|
BuildRequires: ocaml, ocaml-findlib-devel, ocaml-ocamldoc
|
||||||
|
|
||||||
Patch0: 0001-Fix-testsuite-on-32-bit-machines.patch
|
Patch0: 0001-Fix-testsuite-on-32-bit-machines.patch
|
||||||
|
@ -27,6 +25,9 @@ Patch3: cil-1.7.3-add-package-cilconfig.patch
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1120273
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1120273
|
||||||
Patch4: ocaml-4.02.0.patch
|
Patch4: ocaml-4.02.0.patch
|
||||||
|
|
||||||
|
# Fix for bytecode compilation (only apply this when !opt).
|
||||||
|
Patch5: cil-1.7.3-bytecode-compilation.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
CIL (C Intermediate Language) is a high-level representation along
|
CIL (C Intermediate Language) is a high-level representation along
|
||||||
with a set of tools that permit easy analysis and source-to-source
|
with a set of tools that permit easy analysis and source-to-source
|
||||||
|
@ -109,6 +110,9 @@ for gcc.
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
|
%if !%opt
|
||||||
|
%patch5 -p1
|
||||||
|
%endif
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
|
@ -184,6 +188,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
* 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
|
- Build on ARMv7 (rhbz 994968) as it seems to now be fixed
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue