rpms/ocaml-ocamlnet
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes for OCaml 4.10.

Browse Source
This commit is contained in:
Richard W.M. Jones 2020-01-19 16:38:10 +00:00
parent 34f8b8dc83
commit 2bbc36054f
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ocaml-ocamlnet.spec
View File

@ -16,6 +16,9 @@ License: BSD
URL: http://projects.camlcity.org/projects/ocamlnet.html
Source0: http://download.camlcity.org/download/ocamlnet-%{version}.tar.gz
# Patch for OCaml 4.10.
Patch1: ocamlnet-4.1.6-ocaml410.patch
BuildRequires: ocaml >= 3.12.1-3
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-findlib-devel
@ -107,6 +110,7 @@ files for developing applications that use %{name}-nethttpd.
%prep
%setup -q -n ocamlnet-%{version}
%patch1 -p1
%build

37
ocamlnet-4.1.6-ocaml410.patch Normal file
View File

@ -0,0 +1,37 @@
File ocamlnet-4.1.6.old/src/netsys/configtests/mkfifoat_test is a fifo while file ocamlnet-4.1.6/src/netsys/configtests/mkfifoat_test is a fifo
diff -ur ocamlnet-4.1.6.old/src/netsys/netsys_c.h ocamlnet-4.1.6/src/netsys/netsys_c.h
--- ocamlnet-4.1.6.old/src/netsys/netsys_c.h 2018-05-08 08:42:00.000000000 +0100
+++ ocamlnet-4.1.6/src/netsys/netsys_c.h 2020-01-19 16:34:54.461449380 +0000
@@ -122,6 +122,7 @@
#define Is_in_heap(a) (Classify_addr(a) & In_heap)
+#if 0
/* Stuff from minor_gc.h */
CAMLextern char *caml_young_start;
@@ -150,6 +151,7 @@
#define Phase_mark 0
extern void caml_darken (value, value *);
+#endif
#endif
diff -ur ocamlnet-4.1.6.old/src/netsys/netsys_c_outofheap.c ocamlnet-4.1.6/src/netsys/netsys_c_outofheap.c
--- ocamlnet-4.1.6.old/src/netsys/netsys_c_outofheap.c 2018-05-08 08:42:00.000000000 +0100
+++ ocamlnet-4.1.6/src/netsys/netsys_c_outofheap.c 2020-01-19 16:35:41.530802566 +0000
@@ -9,6 +9,8 @@
#include "netsys_c.h"
+#if 0
+
#ifdef HAVE_NEW_MODIFY
/* implies FANCY_PAGE_TABLES */
@@ -42,3 +44,4 @@
}
#endif
+#endif