OCaml 4.12.0 build

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

0001-Build-ocamlrpcgen-as-native-code.patch

@@ -0,0 +1,45 @@
+From 828a873df2b838e46faa5700dbae18601cb8dcb9 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Thu, 14 Jan 2021 12:20:03 +0000
+Subject: [PATCH] Build ocamlrpcgen as native code.
+
+---
+ code/src/rpc-generator/Makefile | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/code/src/rpc-generator/Makefile b/code/src/rpc-generator/Makefile
+index e0ed4f5..a475e83 100644
+--- a/code/src/rpc-generator/Makefile
++++ b/code/src/rpc-generator/Makefile
+@@ -6,9 +6,11 @@ PKGNAME  = rpc-generator
+ ARCHIVE  = rpc_generator
+ OBJECTS  = config.cmo syntax.cmo options.cmo parser.cmo lexer.cmo rename.cmo \
+            generate.cmo direct.cmo
++XOBJECTS = config.cmx syntax.cmx options.cmx parser.cmx lexer.cmx rename.cmx \
++           generate.cmx direct.cmx
+ DOBJECTS = 
+ 
+-ALL_EXTRA = ocamlrpcgen$(EXEC_SUFFIX) rpcgen-packlist
++OPT_EXTRA = ocamlrpcgen$(EXEC_SUFFIX) rpcgen-packlist
+ 
+ PACKLIST = rpcgen-packlist
+ 
+@@ -21,12 +23,12 @@ PP_OPTIONS = -pp "$(CPPO) $(PP_BYTES) $(PP_DEPRECATED)"
+ 
+ include $(TOP_DIR)/Makefile.rules
+ 
+-ocamlrpcgen$(EXEC_SUFFIX): $(ARCHIVE).cma main.cmo
++ocamlrpcgen$(EXEC_SUFFIX): $(ARCHIVE).cmxa main.cmx
+ 	rm -f ocamlrpcgen ocamlrpcgen$(EXEC_SUFFIX)
+ 	OCAMLPATH="..$(PATH_SEP)$$OCAMLPATH" \
+-	$(OCAMLC) -custom -o ocamlrpcgen \
++	$(OCAMLOPT) -o ocamlrpcgen \
+ 		-package unix,netstring,$(REGEXP_PROVIDER) \
+-		$(ARCHIVE).cma main.cmo -linkpkg
++		$(ARCHIVE).cmxa main.cmx -linkpkg
+ 
+ rpcgen-packlist:
+ 	echo $(BINDIR)/ocamlrpcgen >rpcgen-packlist
+-- 
+2.28.0.rc2
+

ocaml-ocamlnet.spec

@@ -1,24 +1,16 @@
-# Prevent RPM from stripping the binaries & debuginfo.
-#
-# NB: Only required because this package uses the obsolete -custom
-# parameter and builds a bytecode 'ocamlrpcgen'.  I tried to fix the
-# build to make a native code 'ocamlrpcgen' but the build system got
-# the better of me.
-%global debug_package %{nil}
-%global __strip /bin/true
-
 Name:           ocaml-ocamlnet
-Version:        4.1.6
-Release:        12%{?dist}
+Version:        4.1.8
+Release:        4%{?dist}
 Summary:        Network protocols for OCaml
 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
+# Build ocamlrpcgen as native code.  Sent upstream 2021-01-14.
+Patch1:         0001-Build-ocamlrpcgen-as-native-code.patch
 
+BuildRequires:  make
 BuildRequires:  ocaml >= 3.12.1-3
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-findlib-devel
@@ -110,7 +102,7 @@ files for developing applications that use %{name}-nethttpd.
 
 %prep
 %setup -q -n ocamlnet-%{version}
-%patch1 -p1
+%patch1 -p2
 
 
 %build
@@ -129,6 +121,13 @@ unset MAKEFLAGS
   -enable-tcl \
   -enable-zip
 
+# This is a hack caused by the ocamlrpcgen patch.  Because "make all"
+# no longer builds ocamlrpcgen (it is now built by "make opt") but
+# some other parts of the build depend on this program, we have to run
+# make opt first and ignore the result.  Hopefully we'll get a better
+# result when upstream integrate the patch.  RWMJ 2021-01.
+make opt ||:
+
 make all
 
 %ifarch %{ocaml_native_compiler}
@@ -221,11 +220,41 @@ echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \
 
 
 %changelog
-* Thu Apr  9 2020 Jerry James <loganjerry@gmail.com> - 4.1.6-12
-- Rebuild against ocaml-zip 1.10
+* Mon Mar  1 11:02:44 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 4.1.8-4
+- OCaml 4.12.0 build
 
-* Thu Feb 27 2020 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-11.1
-- OCaml 4.10.0 final (Fedora 32).
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Jan 14 2021 Richard W.M. Jones <rjones@redhat.com> - 4.1.8-2
+- Build ocamlrpcgen as native code.
+- Enable stripping.
+- Enable LTO (RHBZ#1915570).
+
+* Wed Jan 13 2021 Richard W.M. Jones <rjones@redhat.com> - 4.1.8-1
+- New upstream version 4.1.8.
+- Disable LTO (RHBZ#1915570).
+
+* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-18
+- OCaml 4.11.1 rebuild
+
+* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-17
+- OCaml 4.11.0 rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.6-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-15
+- OCaml 4.11.0+dev2-2020-04-22 rebuild
+
+* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-14
+- OCaml 4.11.0 pre-release attempt 2
+
+* Fri Apr 17 2020 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-13
+- OCaml 4.11.0 pre-release
+
+* Thu Apr 02 2020 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-12
+- Update all OCaml dependencies for RPM 4.16.
 
 * Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-11
 - OCaml 4.10.0 final.

ocamlnet-4.1.6-ocaml410.patch

@@ -1,37 +0,0 @@
-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

sources

@@ -1 +1 @@
-SHA512 (ocamlnet-4.1.6.tar.gz) = 5bd6437f3ffea309c4382b79bbf87cc46c2fa88c5191df7b1d62294ce523aa25ba7fcf41c8c1cfade5396859db209d60b8b00062b103b1cab2761896443bf881
+SHA512 (ocamlnet-4.1.8.tar.gz) = e238235968b9546c60568a38e68e354378d30e7137973332dcb10da21fa775ab7b367889fc51f5bd7cb00e51582834cafe2a0c4706b0bc77a44d4571a6f22815