Gentoo Archives: gentoo-commits

From: Alfredo Tupone <tupone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/lwt/files/, dev-ml/lwt/
Date: Fri, 01 Oct 2021 18:41:30
Message-Id: 1633113675.a9dfe8a9fc72a76428cc16daba1ab7a484a60e5c.tupone@gentoo
1 commit: a9dfe8a9fc72a76428cc16daba1ab7a484a60e5c
2 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 1 18:41:15 2021 +0000
4 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 1 18:41:15 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9dfe8a9
7
8 dev-ml/lwt: build with ocaml-4.12
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
12
13 dev-ml/lwt/files/lwt-5.3.0-ocaml-4.12.patch | 24 ++++++++++++++++++++++++
14 dev-ml/lwt/lwt-5.3.0-r1.ebuild | 5 +++++
15 dev-ml/lwt/metadata.xml | 4 ++++
16 3 files changed, 33 insertions(+)
17
18 diff --git a/dev-ml/lwt/files/lwt-5.3.0-ocaml-4.12.patch b/dev-ml/lwt/files/lwt-5.3.0-ocaml-4.12.patch
19 new file mode 100644
20 index 00000000000..048e28d1d6b
21 --- /dev/null
22 +++ b/dev-ml/lwt/files/lwt-5.3.0-ocaml-4.12.patch
23 @@ -0,0 +1,24 @@
24 +--- a/src/unix/lwt_unix.cppo.ml 2021-10-01 20:35:45.285987395 +0200
25 ++++ b/src/unix/lwt_unix.cppo.ml 2021-10-01 20:36:19.570493202 +0200
26 +@@ -1819,6 +1819,9 @@
27 + | SO_ACCEPTCONN
28 + | TCP_NODELAY
29 + | IPV6_ONLY
30 ++#if OCAML_VERSION >= (4, 12, 0)
31 ++ | SO_REUSEPORT
32 ++#endif
33 +
34 + type socket_int_option =
35 + Unix.socket_int_option =
36 +--- a/src/unix/lwt_unix.cppo.mli 2021-10-01 20:33:57.558539065 +0200
37 ++++ b/src/unix/lwt_unix.cppo.mli 2021-10-01 20:35:30.393202008 +0200
38 +@@ -1008,6 +1008,9 @@
39 + | SO_ACCEPTCONN
40 + | TCP_NODELAY
41 + | IPV6_ONLY
42 ++#if OCAML_VERSION >= (4, 12, 0)
43 ++ | SO_REUSEPORT
44 ++#endif
45 +
46 + type socket_int_option =
47 + Unix.socket_int_option =
48
49 diff --git a/dev-ml/lwt/lwt-5.3.0-r1.ebuild b/dev-ml/lwt/lwt-5.3.0-r1.ebuild
50 index b635eab67eb..40958766de0 100644
51 --- a/dev-ml/lwt/lwt-5.3.0-r1.ebuild
52 +++ b/dev-ml/lwt/lwt-5.3.0-r1.ebuild
53 @@ -32,4 +32,9 @@ BDEPEND="
54 # backported from https://github.com/ocsigen/lwt/pull/807
55 PATCHES=(
56 "${FILESDIR}"/${PN}-5.3.0-ppxlib-0.18.0.patch
57 + "${FILESDIR}"/${P}-ocaml-4.12.patch
58 )
59 +
60 +src_compile() {
61 + dune build @install --profile release || die
62 +}
63
64 diff --git a/dev-ml/lwt/metadata.xml b/dev-ml/lwt/metadata.xml
65 index 18be4f6c21a..52dc9a8f746 100644
66 --- a/dev-ml/lwt/metadata.xml
67 +++ b/dev-ml/lwt/metadata.xml
68 @@ -1,6 +1,10 @@
69 <?xml version="1.0" encoding="UTF-8"?>
70 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
71 <pkgmetadata>
72 + <maintainer type="project">
73 + <email>ml@g.o</email>
74 + <name>ML</name>
75 + </maintainer>
76 <maintainer type="person">
77 <email>gienah@g.o</email>
78 <name>Mark Wright</name>