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

[Alfredo Tupone]

commit: 30b7745ed174255ab0e2fb712927065df9e6f4f4
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Thu Dec 22 07:43:59 2022 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Thu Dec 22 07:45:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30b7745e

dev-ml/ocamlnet: add hard dependency in Makefile

Closes: https://bugs.gentoo.org/887479
Closes: https://bugs.gentoo.org/887687
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-ml/ocamlnet/files/ocamlnet-4.1.9-unboundLexer.patch | 10 ++
 dev-ml/ocamlnet/ocamlnet-4.1.9.ebuild   |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/dev-ml/ocamlnet/files/ocamlnet-4.1.9-unboundLexer.patch 
b/dev-ml/ocamlnet/files/ocamlnet-4.1.9-unboundLexer.patch
new file mode 100644
index ..416df217c035
--- /dev/null
+++ b/dev-ml/ocamlnet/files/ocamlnet-4.1.9-unboundLexer.patch
@@ -0,0 +1,10 @@
+--- a/src/rpc-generator/Makefile   2022-12-22 08:32:49.839794123 +0100
 b/src/rpc-generator/Makefile   2022-12-22 08:34:48.185817182 +0100
+@@ -31,4 +31,7 @@
+ rpcgen-packlist:
+   echo $(BINDIR)/ocamlrpcgen >rpcgen-packlist
+ 
++main.cmo: lexer.cmo
++lexer.cmo: parser.cmo
++
+ include depend

diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.9.ebuild 
b/dev-ml/ocamlnet/ocamlnet-4.1.9.ebuild
index 5eb163cf9132..6bd4d2437240 100644
--- a/dev-ml/ocamlnet/ocamlnet-4.1.9.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-4.1.9.ebuild
@@ -35,6 +35,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-unboundLexer.patch )
+
 ocamlnet_use_with() {
if use $1; then
echo "-with-$2"

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

[Alexis Ballier]

commit: d7d57903f6e0094b295fc3bcf9bb1f83443b9c5c
Author: Alexis Ballier  gentoo  org>
AuthorDate: Fri Jun 30 11:42:02 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Fri Jun 30 12:47:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7d57903

dev-ml/ocamlnet: backport upstream fix to build with ocaml 4.05

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-ml/ocamlnet/files/ocaml405.patch  | 145 ++
 dev-ml/ocamlnet/ocamlnet-4.1.2.ebuild |   6 +-
 2 files changed, 150 insertions(+), 1 deletion(-)

diff --git a/dev-ml/ocamlnet/files/ocaml405.patch 
b/dev-ml/ocamlnet/files/ocaml405.patch
new file mode 100644
index 000..a112d1fb447
--- /dev/null
+++ b/dev-ml/ocamlnet/files/ocaml405.patch
@@ -0,0 +1,145 @@
+commit f3d451b81c4caa8cce7f55af6463ec685e79e227
+Author: Gerd Stolpmann 
+Date:   Sun Feb 26 21:04:49 2017 +0100
+
+ocaml-4.05: support for O_KEEPEXEC
+
+diff --git a/code/src/netsys/Makefile b/code/src/netsys/Makefile
+index cbc1ce2..cb70a09 100644
+--- a/code/src/netsys/Makefile
 b/code/src/netsys/Makefile
+@@ -56,7 +56,7 @@ OCAMLC_OPTIONS_FOR_netsys_c_xdr.c = -ccopt -O
+ OCAMLC_OPTIONS += $(STRING_OPTS)
+ OCAMLOPT_OPTIONS += $(STRING_OPTS)
+ 
+-PP_OPTIONS = -pp "$(CPPO) $(DEF_O_SHARE_DELETE) $(DEF_O_CLOEXEC) $(PP_BYTES) 
$(PP_DEPRECATED)"
++PP_OPTIONS = -pp "$(CPPO) $(DEF_O_SHARE_DELETE) $(DEF_O_CLOEXEC) 
$(DEF_O_KEEPEXEC) $(PP_BYTES) $(PP_DEPRECATED)"
+ 
+ INSTALL_EXTRA += netsys_c_event.h $(OOH_OBJECT)
+ 
+diff --git a/code/src/netsys/configure b/code/src/netsys/configure
+index 1325843..f4dbc09 100755
+--- a/code/src/netsys/configure
 b/code/src/netsys/configure
+@@ -437,6 +437,21 @@ else
+ echo "no"
+ fi
+ 
++##
++
++printf "Checking for O_KEEPEXEC... "
++mkdir -p tmp
++cat <<_EOF_ >tmp/t.ml
++let x = Unix.O_KEEPEXEC;;
++_EOF_
++
++def_o_keepexec="-D NO_O_KEEPEXEC"
++if ocaml unix.cma tmp/t.ml >/dev/null 2>/dev/null; then
++echo "yes"
++def_o_keepexec="-D HAVE_O_KEEPEXEC"
++else
++echo "no"
++fi
+ 
+ ##
+ 
+@@ -445,6 +460,7 @@ cat