aballier 15/07/16 12:51:08 Added: lwt.patch lwt2.patch lwt3.patch Log: backport upstream patches to build against lwt 2.5 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path 1.1 www-servers/ocsigenserver/files/lwt.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/ocsigenserver/files/lwt.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/ocsigenserver/files/lwt.patch?rev=1.1&content-type=text/plain Index: lwt.patch =================================================================== commit 156f8deaae2a50d8b9614b99488f34b284382eaa Author: Drup <[email protected]> Date: Thu Dec 11 16:52:33 2014 +0100 Remove dependency to Lwt_util. diff --git a/src/server/ocsigen_server.ml b/src/server/ocsigen_server.ml index c5563a6..e548f5e 100644 --- a/src/server/ocsigen_server.ml +++ b/src/server/ocsigen_server.ml @@ -1040,7 +1040,7 @@ let rec wait_connection use_ssl port socket = >>= decr_connected in - Lwt_util.iter handle_one l >>= fun () -> + Lwt_list.iter_p handle_one l >>= fun () -> match e with | Some e -> handle_exn e | None -> Lwt.return ()) 1.1 www-servers/ocsigenserver/files/lwt2.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/ocsigenserver/files/lwt2.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/ocsigenserver/files/lwt2.patch?rev=1.1&content-type=text/plain Index: lwt2.patch =================================================================== commit faaa943aacaeaee27e5a309bb54bd539ec1a58a2 Author: Drup <[email protected]> Date: Sat Dec 6 05:08:13 2014 +0100 Replace use of the deprecated `Lwt_event` by `Lwt_react.E`. diff --git a/src/extensions/ocsigen_comet.ml b/src/extensions/ocsigen_comet.ml index ad7d9dd..ccc0719 100644 --- a/src/extensions/ocsigen_comet.ml +++ b/src/extensions/ocsigen_comet.ml @@ -468,7 +468,7 @@ end = struct Lwt.choose [ (choosed >|= fun x -> Some x); (Lwt_unix.sleep (get_timeout ()) >|= fun () -> None); - (Lwt_event.next Security.kill >>= fun () -> Lwt.fail Kill); + (Lwt_react.E.next Security.kill >>= fun () -> Lwt.fail Kill); ] >|= fun x -> List.iter (fun c -> Channels.send_listeners c (-1)) active ; let s = Messages.encode_downgoing ended x in 1.1 www-servers/ocsigenserver/files/lwt3.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/ocsigenserver/files/lwt3.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/ocsigenserver/files/lwt3.patch?rev=1.1&content-type=text/plain Index: lwt3.patch =================================================================== commit 5b60babe229189c2be999e138c500527334c3415 Author: pveber <[email protected]> Date: Fri Feb 27 09:24:50 2015 +0100 fix configure and Makefiles following lwt.extra deprecation Now that lwt.extra has been deprecated [0], the configure and Makefile scripts should refer directly to lwt.preemptive. [0] https://github.com/ocsigen/lwt/commit/91d549b54397a33ed80de962771d07180c4b8d4e Index: ocsigenserver-2.5/Makefile.options =================================================================== --- ocsigenserver-2.5.orig/Makefile.options +++ ocsigenserver-2.5/Makefile.options @@ -26,14 +26,14 @@ endif ## but also to generate src/baselib/ocsigen_config.ml and src/files/META ifeq "$(PREEMPTIVE)" "YES" -LWT_EXTRA_PACKAGE:=lwt.extra +LWT_PREEMPTIVE_PACKAGE:=lwt.preemptive endif BASE_PACKAGE := lwt ipaddr SERVER_PACKAGE := lwt.ssl \ - ${LWT_EXTRA_PACKAGE} \ - ipaddr \ + ${LWT_PREEMPTIVE_PACKAGE} \ + ipaddr \ netstring \ netstring-pcre \ findlib \ Index: ocsigenserver-2.5/configure =================================================================== --- ocsigenserver-2.5.orig/configure +++ ocsigenserver-2.5/configure @@ -410,7 +410,7 @@ check_library lwt "See: http://ocsigen.o check_library lwt.unix "Missing support for 'unix' in lwt." check_library lwt.react "Missing support for 'react' in lwt." check_library lwt.ssl "Missing support for 'ssl' in lwt." -#check_library lwt.extra "Missing support for 'extra' in lwt." +check_library lwt.preemptive "Missing support for 'preemptive' in lwt." check_library netstring \ "See ocamlnet: http://projects.camlcity.org/projects/ocamlnet.html"; @@ -454,12 +454,12 @@ if [ "$with_camlzip" -gt 0 ]; then fi fi -# Check Lwt.extra +# Check Lwt.preemptive if [ "$with_preempt" -gt 0 ]; then - if test_library lwt.extra; then + if test_library lwt.preemptive; then echo -n elif [ "$with_preempt" -gt 1 ]; then - fail_library lwt.extra "Missing support for 'extra' in lwt." + fail_library lwt.preemptive "Missing support for 'preemptive' in lwt." else with_preempt=0 fi Index: ocsigenserver-2.5/src/baselib/Makefile =================================================================== --- ocsigenserver-2.5.orig/src/baselib/Makefile +++ ocsigenserver-2.5/src/baselib/Makefile @@ -1,6 +1,6 @@ include ../../Makefile.config -LIBS := -package lwt.unix,netstring,netstring-pcre,cryptokit,findlib,tyxml,lwt.syntax,${LWT_EXTRA_PACKAGE},ipaddr +LIBS := -package lwt.unix,netstring,netstring-pcre,cryptokit,findlib,tyxml,lwt.syntax,${LWT_PREEMPTIVE_PACKAGE},ipaddr OCAMLC := $(OCAMLFIND) ocamlc${BYTEDBG} ${THREAD} OCAMLOPT := $(OCAMLFIND) ocamlopt ${OPTDBG} ${THREAD} OCAMLDOC := $(OCAMLFIND) ocamldoc Index: ocsigenserver-2.5/src/extensions/ocsipersist-dbm/Makefile =================================================================== --- ocsigenserver-2.5.orig/src/extensions/ocsipersist-dbm/Makefile +++ ocsigenserver-2.5/src/extensions/ocsipersist-dbm/Makefile @@ -1,6 +1,6 @@ include ../../../Makefile.config -PACKAGE := ${LWT_EXTRA_PACKAGE} \ +PACKAGE := ${LWT_PREEMPTIVE_PACKAGE} \ lwt.unix \ tyxml.parser \ dbm \
