- Remove patch which worked around segfault on ARM. Now fixed
in OCaml >= 3.12.1-9.
This commit is contained in:
parent
3a02209c15
commit
db39bf22b0
@ -1,12 +0,0 @@
|
||||
--- camomile-0.8.3/mappings/gen_mappings.ml.old 2012-05-19 10:48:13.369690746 +0100
|
||||
+++ camomile-0.8.3/mappings/gen_mappings.ml 2012-05-19 10:42:42.961692259 +0100
|
||||
@@ -159,7 +159,8 @@
|
||||
| _ -> ())
|
||||
| TW ->
|
||||
(match String.length enc with
|
||||
- 1 -> () (*ascii*)
|
||||
+ 1 ->
|
||||
+ print_string ""; () (*ascii*)
|
||||
| 2 -> (*CNS 11643 Plane 1*)
|
||||
let enc1 = Char.code enc.[0] in
|
||||
let enc2 = Char.code enc.[1] in
|
@ -3,7 +3,7 @@
|
||||
|
||||
Name: ocaml-camomile
|
||||
Version: 0.8.3
|
||||
Release: 4%{?dist}
|
||||
Release: 5%{?dist}
|
||||
Summary: Unicode library for OCaml
|
||||
|
||||
Group: Development/Libraries
|
||||
@ -16,11 +16,10 @@ Source0: http://downloads.sourceforge.net/camomile/camomile-%{version}.ta
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
ExcludeArch: sparc64 s390 s390x
|
||||
|
||||
BuildRequires: ocaml, ocaml-findlib-devel, ocaml-ocamldoc, ocaml-camlp4-devel
|
||||
|
||||
# This works around a segfault when the gen_mappings.ml program is
|
||||
# run after being compiled with the new ARM backend.
|
||||
Patch1: camomile-new-arm-segfault-workaround.patch
|
||||
BuildRequires: ocaml >= 3.12.1-9
|
||||
BuildRequires: ocaml-findlib-devel
|
||||
BuildRequires: ocaml-ocamldoc
|
||||
BuildRequires: ocaml-camlp4-devel
|
||||
|
||||
%define _use_internal_dependency_generator 0
|
||||
%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
|
||||
@ -58,8 +57,6 @@ applications that use %{name}.
|
||||
%prep
|
||||
%setup -q -n camomile-%{version}
|
||||
|
||||
%patch1 -p1
|
||||
|
||||
# This is a horrible hack to work around a bug in our ppc64 code
|
||||
# generator. For some reason which we don't fully understand it barfs
|
||||
# on the long entry function created by the series of alias commands
|
||||
@ -150,6 +147,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%changelog
|
||||
* Sun Jun 3 2012 Richard W.M. Jones <rjones@redhat.com> - 0.8.3-5
|
||||
- Remove patch which worked around segfault on ARM. Now fixed
|
||||
in OCaml >= 3.12.1-9.
|
||||
|
||||
* Wed May 30 2012 Richard W.M. Jones <rjones@redhat.com> - 0.8.3-4
|
||||
- Remove ExcludeArch ppc64.
|
||||
- Add sed hack to reduce size of long entry function which breaks
|
||||
|
Loading…
Reference in New Issue
Block a user