On Sat, Dec 04 2021, Daniel Dickman <didick...@gmail.com> wrote:
> See below for a diff for ocaml to the 4.12.x series. Only a few changes
> were needed for this update and they're already in the tree:
> - mldonkey and unison 2.4.x needed a small diff
> - dune needed to be updated to 2.7.0
>
> All ocaml ports were built successfully on amd64 (except coccinelle which
> is still broken).
This update doesn't package on sparc64 and riscv64 - and likely all
non-native archs. The diff below fixes this for me, and seems to be
correct. IIUC the compilation of those two files is hooked from ASMCOMP
in ./compilerlibs/Makefile.compilerlibs.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/ocaml/Makefile,v
retrieving revision 1.90
diff -u -p -r1.90 Makefile
--- Makefile 10 Dec 2021 04:10:59 -0000 1.90
+++ Makefile 17 Dec 2021 15:45:24 -0000
@@ -5,6 +5,7 @@ COMMENT = ML language with complete c
# XXX Don't even think of updating ocaml alone.
# Do check that the ports that depend on it still work, or repair them.
VERSION= 4.12.1
+REVISION= 0
PKGNAME = ocaml-${VERSION:C/\+//}
Index: pkg/PFRAG.native
===================================================================
RCS file: /cvs/ports/lang/ocaml/pkg/PFRAG.native,v
retrieving revision 1.20
diff -u -p -r1.20 PFRAG.native
--- pkg/PFRAG.native 10 Dec 2021 04:11:00 -0000 1.20
+++ pkg/PFRAG.native 17 Dec 2021 15:45:24 -0000
@@ -427,6 +427,9 @@ lib/ocaml/compiler-libs/linear.cmt
lib/ocaml/compiler-libs/linear.cmti
lib/ocaml/compiler-libs/linear.cmx
lib/ocaml/compiler-libs/linear.mli
+lib/ocaml/compiler-libs/linear_format.cmi
+lib/ocaml/compiler-libs/linear_format.cmt
+lib/ocaml/compiler-libs/linear_format.cmti
lib/ocaml/compiler-libs/linear_format.cmx
lib/ocaml/compiler-libs/linearize.cmi
lib/ocaml/compiler-libs/linearize.cmt
@@ -496,6 +499,9 @@ lib/ocaml/compiler-libs/optmain.cmo
lib/ocaml/compiler-libs/optmain.cmt
lib/ocaml/compiler-libs/optmain.cmx
lib/ocaml/compiler-libs/optmain.o
+lib/ocaml/compiler-libs/optmaindriver.cmi
+lib/ocaml/compiler-libs/optmaindriver.cmt
+lib/ocaml/compiler-libs/optmaindriver.cmti
lib/ocaml/compiler-libs/optmaindriver.cmx
lib/ocaml/compiler-libs/parameter.cmi
lib/ocaml/compiler-libs/parameter.cmt
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/ocaml/pkg/PLIST,v
retrieving revision 1.29
diff -u -p -r1.29 PLIST
--- pkg/PLIST 10 Dec 2021 04:11:00 -0000 1.29
+++ pkg/PLIST 17 Dec 2021 15:45:25 -0000
@@ -360,9 +360,6 @@ lib/ocaml/compiler-libs/lexer.cmi
lib/ocaml/compiler-libs/lexer.cmt
lib/ocaml/compiler-libs/lexer.cmti
lib/ocaml/compiler-libs/lexer.mli
-lib/ocaml/compiler-libs/linear_format.cmi
-lib/ocaml/compiler-libs/linear_format.cmt
-lib/ocaml/compiler-libs/linear_format.cmti
lib/ocaml/compiler-libs/linear_format.mli
lib/ocaml/compiler-libs/load_path.cmi
lib/ocaml/compiler-libs/load_path.cmt
@@ -429,9 +426,6 @@ lib/ocaml/compiler-libs/oprint.cmti
lib/ocaml/compiler-libs/oprint.mli
lib/ocaml/compiler-libs/optcompile.mli
lib/ocaml/compiler-libs/opterrors.mli
-lib/ocaml/compiler-libs/optmaindriver.cmi
-lib/ocaml/compiler-libs/optmaindriver.cmt
-lib/ocaml/compiler-libs/optmaindriver.cmti
lib/ocaml/compiler-libs/optmaindriver.mli
lib/ocaml/compiler-libs/opttopdirs.mli
lib/ocaml/compiler-libs/opttoploop.mli
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
