| 1 |
commit: f0aefa837e2e397bc4678723122de1a27b01a02d |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jun 2 12:23:57 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 3 15:13:26 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0aefa83 |
| 7 |
|
| 8 |
dev-ml/ocaml-dns: backport upstream patch to build with latest ocaml-uri |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 11 |
|
| 12 |
dev-ml/ocaml-dns/files/uri.patch | 21 +++++++++++++++++++++ |
| 13 |
dev-ml/ocaml-dns/ocaml-dns-0.20.1.ebuild | 5 +++++ |
| 14 |
2 files changed, 26 insertions(+) |
| 15 |
|
| 16 |
diff --git a/dev-ml/ocaml-dns/files/uri.patch b/dev-ml/ocaml-dns/files/uri.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..09e50cfc5ea |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-ml/ocaml-dns/files/uri.patch |
| 21 |
@@ -0,0 +1,21 @@ |
| 22 |
+commit 152097361dbe987af5de4efde78ed28c720900a8 |
| 23 |
+Author: Anil Madhavapeddy <anil@××××××.org> |
| 24 |
+Date: Tue May 30 20:45:06 2017 +0100 |
| 25 |
+ |
| 26 |
+ zone_parser: explictly depend on uri.services |
| 27 |
+ |
| 28 |
+ This seems to have been pulled in implicitly before, but breaks |
| 29 |
+ when compiled with jbuilder |
| 30 |
+ |
| 31 |
+diff --git a/_tags b/_tags |
| 32 |
+index b38be12..bb5d5c0 100644 |
| 33 |
+--- a/_tags |
| 34 |
++++ b/_tags |
| 35 |
+@@ -9,6 +9,7 @@ true : package(re re.str ipaddr uri base64 hashcons cstruct result) |
| 36 |
+ "lwt": include |
| 37 |
+ <lwt/*.{ml,mli}>: package(lwt mirage-profile) |
| 38 |
+ <lwt/dig_unix.*>: package(cmdliner lwt.unix uri.services ipaddr.unix lwt) |
| 39 |
++<lib/zone_parser.*>: package(uri.services) |
| 40 |
+ <mirage/*.{ml,mli}>: package(lwt duration mirage-time-lwt) |
| 41 |
+ <mirage/*.{ml,mli}>: package(mirage-stack-lwt mirage-kv-lwt) |
| 42 |
+ |
| 43 |
|
| 44 |
diff --git a/dev-ml/ocaml-dns/ocaml-dns-0.20.1.ebuild b/dev-ml/ocaml-dns/ocaml-dns-0.20.1.ebuild |
| 45 |
index 9e32c2f31ec..af628a82870 100644 |
| 46 |
--- a/dev-ml/ocaml-dns/ocaml-dns-0.20.1.ebuild |
| 47 |
+++ b/dev-ml/ocaml-dns/ocaml-dns-0.20.1.ebuild |
| 48 |
@@ -43,6 +43,11 @@ DEPEND=" |
| 49 |
# Missing mirage deps |
| 50 |
RESTRICT="test" |
| 51 |
|
| 52 |
+src_prepare() { |
| 53 |
+ epatch "${FILESDIR}/uri.patch" |
| 54 |
+ default |
| 55 |
+} |
| 56 |
+ |
| 57 |
src_compile() { |
| 58 |
ocaml pkg/pkg.ml build \ |
| 59 |
--tests $(usex test true false) \ |
Archives