1 |
commit: 2c552c8ceb02f26d20454c1e050e24eca4fae890 |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 29 12:54:45 2016 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 29 15:05:22 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c552c8c |
7 |
|
8 |
dev-ml/ocamlpam: fix build with ocaml 4.04 |
9 |
|
10 |
Package-Manager: portage-2.3.2 |
11 |
|
12 |
dev-ml/ocamlpam/files/ocaml404.patch | 12 ++++++++++++ |
13 |
dev-ml/ocamlpam/ocamlpam-1.1.ebuild | 3 ++- |
14 |
2 files changed, 14 insertions(+), 1 deletion(-) |
15 |
|
16 |
diff --git a/dev-ml/ocamlpam/files/ocaml404.patch b/dev-ml/ocamlpam/files/ocaml404.patch |
17 |
new file mode 100644 |
18 |
index 00000000..4964edf |
19 |
--- /dev/null |
20 |
+++ b/dev-ml/ocamlpam/files/ocaml404.patch |
21 |
@@ -0,0 +1,12 @@ |
22 |
+Index: ocamlpam-1.1/pam_stubs.c |
23 |
+=================================================================== |
24 |
+--- ocamlpam-1.1.orig/pam_stubs.c |
25 |
++++ ocamlpam-1.1/pam_stubs.c |
26 |
+@@ -57,6 +57,7 @@ static int converse(int nMsg, const stru |
27 |
+ struct pam_response * local_responses; |
28 |
+ caml_pam_handle * h; |
29 |
+ |
30 |
++ CAMLparam0 (); |
31 |
+ CAMLlocal1(ret); |
32 |
+ |
33 |
+ h = (caml_pam_handle *)data; |
34 |
|
35 |
diff --git a/dev-ml/ocamlpam/ocamlpam-1.1.ebuild b/dev-ml/ocamlpam/ocamlpam-1.1.ebuild |
36 |
index b2b67cd..79a0e96 100644 |
37 |
--- a/dev-ml/ocamlpam/ocamlpam-1.1.ebuild |
38 |
+++ b/dev-ml/ocamlpam/ocamlpam-1.1.ebuild |
39 |
@@ -1,4 +1,4 @@ |
40 |
-# Copyright 1999-2013 Gentoo Foundation |
41 |
+# Copyright 1999-2016 Gentoo Foundation |
42 |
# Distributed under the terms of the GNU General Public License v2 |
43 |
# $Id$ |
44 |
|
45 |
@@ -21,6 +21,7 @@ RDEPEND="${DEPEND}" |
46 |
|
47 |
src_prepare() { |
48 |
epatch "${FILESDIR}/${P}-makefile.patch" |
49 |
+ has_version '>=dev-lang/ocaml-4.04_beta' && epatch "${FILESDIR}/ocaml404.patch" |
50 |
} |
51 |
|
52 |
src_compile() { |