[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlpam/, dev-ml/ocamlpam/files/

[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlpam/, dev-ml/ocamlpam/files/

[Alexis Ballier]

commit:     2c552c8ceb02f26d20454c1e050e24eca4fae890
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 12:54:45 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 15:05:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c552c8c

dev-ml/ocamlpam: fix build with ocaml 4.04

Package-Manager: portage-2.3.2

 dev-ml/ocamlpam/files/ocaml404.patch | 12 ++++++++++++
 dev-ml/ocamlpam/ocamlpam-1.1.ebuild  |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/dev-ml/ocamlpam/files/ocaml404.patch b/dev-ml/ocamlpam/files/ocaml404.patch
new file mode 100644
index 00000000..4964edf
--- /dev/null
+++ b/dev-ml/ocamlpam/files/ocaml404.patch
@@ -0,0 +1,12 @@
+Index: ocamlpam-1.1/pam_stubs.c
+===================================================================
+--- ocamlpam-1.1.orig/pam_stubs.c
++++ ocamlpam-1.1/pam_stubs.c
+@@ -57,6 +57,7 @@ static int converse(int nMsg, const stru
+ 	struct pam_response * local_responses;
+ 	caml_pam_handle * h;
+ 
++  	CAMLparam0 ();
+ 	CAMLlocal1(ret);
+ 
+ 	h = (caml_pam_handle *)data;

diff --git a/dev-ml/ocamlpam/ocamlpam-1.1.ebuild b/dev-ml/ocamlpam/ocamlpam-1.1.ebuild
index b2b67cd..79a0e96 100644
--- a/dev-ml/ocamlpam/ocamlpam-1.1.ebuild
+++ b/dev-ml/ocamlpam/ocamlpam-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -21,6 +21,7 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-makefile.patch"
+	has_version '>=dev-lang/ocaml-4.04_beta' && epatch "${FILESDIR}/ocaml404.patch"
 }
 
 src_compile() {