rpms/ocaml-lwt
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove libev patch since headers are back to normal location

Browse Source 
in libev >= 4.15-3.
This commit is contained in:
Richard W.M. Jones 2014-01-03 22:00:15 +00:00
parent 6419d2de24
commit 131eff5b6b
2 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lwt-2.4.3-libev.patch
View File

@ -1,22 +0,0 @@
--- ./discover.ml.orig 2012-12-27 05:29:57.000000000 -0700
+++ ./discover.ml 2013-09-18 10:00:00.000000000 -0600
@@ -96,7 +96,7 @@ CAMLprim value lwt_test()
let libev_code = "
#include <caml/mlvalues.h>
-#include <ev.h>
+#include <libev/ev.h>
CAMLprim value lwt_test()
{
--- ./src/unix/lwt_libev_stubs.c.orig 2012-12-27 05:29:57.000000000 -0700
+++ ./src/unix/lwt_libev_stubs.c 2013-09-18 10:00:00.000000000 -0600
@@ -33,7 +33,7 @@
#include <caml/signals.h>
#include <caml/custom.h>
#include <caml/callback.h>
-#include <ev.h>
+#include <libev/ev.h>
#include "lwt_unix.h"

7
ocaml-lwt.spec
View File

@ -11,10 +11,6 @@ URL: http://ocsigen.org/lwt
Source0: http://ocsigen.org/download/lwt-%{version}.tar.gz
ExclusiveArch: %{ocaml_arches}
# Location of libev headers on Fedora is in /usr/include/libev/ev.h
# so we need to patch the source accordingly.
Patch0: lwt-2.4.3-libev.patch
# Adapt to changes in OCaml 4.01.0
Patch1: lwt-2.4.3-ocaml41.patch
@ -47,7 +43,6 @@ developing applications that use %{name}.
%prep
%setup -q -n lwt-%{version}
%patch0
%patch1
mv README README.old
@ -104,6 +99,8 @@ OCAMLPATH=$RPM_BUILD_ROOT%{_libdir}/ocaml ocamlfind query lwt.react
%changelog
* Fri Jan 3 2014 Richard W.M. Jones <rjones@redhat.com> - 2.4.3-5
- Enable lwt.react support, and check it gets enabled (RHBZ#1048367).
- Remove libev patch since headers are back to normal location
in libev >= 4.15-3.
* Wed Sep 18 2013 Jerry James <loganjerry@gmail.com> - 2.4.3-4
- Rebuild for OCaml 4.01.0, and add -ocaml41 patch to adapt to changes