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

New upstream version 2.4.2.

Browse Source 
- Rebuild for OCaml 4.00.1.
- Remove patches which are now upstream.
- Clean up spec file.
This commit is contained in:
Richard W.M. Jones 2012-10-30 13:59:24 +00:00
parent e8251a5201
commit 151ed6258c
5 changed files with 12 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
lwt-2.0.0+rc1.tar.gz
/lwt-2.2.0.tar.gz
/lwt-2.3.2.tar.gz
/lwt-2.4.2.tar.gz

38
lwt-2.3.2-ocaml-4.patch
View File

@ -1,38 +0,0 @@
diff -ur lwt-2.3.2.old/src/unix/lwt_unix.ml lwt-2.3.2/src/unix/lwt_unix.ml
--- lwt-2.3.2.old/src/unix/lwt_unix.ml 2011-11-04 16:49:06.000000000 +0000
+++ lwt-2.3.2/src/unix/lwt_unix.ml 2012-06-11 13:07:53.595590313 +0100
@@ -575,6 +575,7 @@
| O_DSYNC
| O_SYNC
| O_RSYNC
+ | O_SHARE_DELETE
#if windows
diff -ur lwt-2.3.2.old/src/unix/lwt_unix.mli lwt-2.3.2/src/unix/lwt_unix.mli
--- lwt-2.3.2.old/src/unix/lwt_unix.mli 2011-11-04 16:49:06.000000000 +0000
+++ lwt-2.3.2/src/unix/lwt_unix.mli 2012-06-11 13:07:32.290246725 +0100
@@ -309,6 +309,7 @@
| O_DSYNC
| O_SYNC
| O_RSYNC
+ | O_SHARE_DELETE
val openfile : string -> open_flag list -> file_perm -> file_descr Lwt.t
(** Wrapper for [Unix.openfile]. *)
diff -ur lwt-2.3.2.old/myocamlbuild.ml lwt-2.3.2/myocamlbuild.ml
--- lwt-2.3.2.old/myocamlbuild.ml 2011-11-04 17:49:08.000000000 +0100
+++ lwt-2.3.2/myocamlbuild.ml 2012-05-25 15:17:21.000000000 +0200
@@ -301,8 +301,8 @@
(* by using Before_options one let command line options have an higher priority *)
(* on the contrary using After_options will guarantee to have the higher priority *)
(* override default commands by ocamlfind ones *)
- Options.ocamlc := ocamlfind & A"ocamlc";
- Options.ocamlopt := ocamlfind & A"ocamlopt";
+ Options.ocamlc := ocamlfind & S[A"ocamlc"; A"-I"; A"+compiler-libs"];
+ Options.ocamlopt := ocamlfind & S[A"ocamlopt"; A"-I"; A"+compiler-libs"];
Options.ocamldep := ocamlfind & A"ocamldep";
Options.ocamldoc := ocamlfind & A"ocamldoc";
Options.ocamlmktop := ocamlfind & A"ocamlmktop"

38
oasis-common.patch
View File

@ -1,38 +0,0 @@
--- setup.ml 2011-03-22 17:00:48.000000000 +0100
+++ setup.ml 2011-12-22 21:41:25.000000000 +0100
@@ -2662,10 +2662,14 @@
(ocamlc_config_map ())
0
in
- let nm_config =
+ let chop_version_suffix s =
+ try String.sub s 0 (String.index s '+')
+ with _ -> s
+ in
+ let nm_config, value_config =
match nm with
- | "ocaml_version" -> "version"
- | _ -> nm
+ | "ocaml_version" -> "version", chop_version_suffix
+ | _ -> nm, (fun x -> x)
in
var_redefine
nm
@@ -2677,7 +2681,7 @@
let value =
SMap.find nm_config map
in
- value
+ value_config value
with Not_found ->
failwithf2
(f_ "Cannot find field '%s' in '%s -config' output")
@@ -3057,7 +3061,7 @@
begin
let acc =
try
- Scanf.bscanf scbuf "%S %S@\n"
+ Scanf.bscanf scbuf "%S %S\n"
(fun e d ->
let t =
e, d

33
ocaml-lwt.spec
View File

@ -1,25 +1,20 @@
%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
%define debug_package %{nil}
%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
%global debug_package %{nil}
Name: ocaml-lwt
Version: 2.3.2
Release: 7%{?dist}
Version: 2.4.2
Release: 1%{?dist}
Summary: OCaml lightweight thread library
Group: Development/Libraries
License: LGPLv2+ with exceptions
URL: http://ocsigen.org/lwt
Source0: http://ocsigen.org/download/lwt-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExcludeArch: sparc64 s390 s390x
# Location of libev headers on Fedora is in /usr/include/libev/ev.h
# so we need to patch the source accordingly.
Patch0: lwt-2.3.2-libev.patch
Patch1: lwt-2.3.2-ocaml-4.patch
Patch2: oasis-common.patch
BuildRequires: ocaml >= 3.10.0
BuildRequires: ocaml-findlib-devel
BuildRequires: ocaml-ocamldoc
@ -29,10 +24,6 @@ BuildRequires: ocaml-react >= 0.9.0
BuildRequires: chrpath
BuildRequires: libev-devel
%define _use_internal_dependency_generator 0
%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
%description
Lwt is a lightweight thread library for Objective Caml. This library
@ -41,7 +32,6 @@ is part of the Ocsigen project.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
@ -54,8 +44,6 @@ developing applications that use %{name}.
%setup -q -n lwt-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p0
mv README README.old
iconv -f iso-8859-1 -t utf-8 < README.old > README
@ -66,7 +54,6 @@ make
%install
rm -rf $RPM_BUILD_ROOT
export DESTDIR=$RPM_BUILD_ROOT
export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
@ -76,12 +63,7 @@ strip $OCAMLFIND_DESTDIR/stublibs/dll*.so
chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc LICENSE COPYING
%{_libdir}/ocaml/lwt
%if %opt
@ -95,7 +77,6 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(-,root,root,-)
%doc LICENSE COPYING CHANGES CHANGES.darcs README
%if %opt
%{_libdir}/ocaml/lwt/*.a
@ -106,6 +87,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Tue Oct 30 2012 Richard W.M. Jones <rjones@redhat.com> - 2.4.2-1
- New upstream version 2.4.2.
- Rebuild for OCaml 4.00.1.
- Remove patches which are now upstream.
- Clean up spec file.
* Mon Jul 30 2012 Richard W.M. Jones <rjones@redhat.com> - 2.3.2-7
- Rebuild for OCaml 4.00.0 official.

2
sources
View File

@ -1 +1 @@
d1b4a8c1ad320c8f7876a8bff157d2d3 lwt-2.3.2.tar.gz
0d6eeaa295d62aefaf39e034460bc7b4 lwt-2.4.2.tar.gz