On Sun, Dec 19, 2021 at 07:46:27PM +0100, Jeremie Courreges-Anglas wrote:
On Sun, Dec 19 2021, Jeremie Courreges-Anglas <[email protected]> wrote:
This fixes packaging on riscv64 and most likely all non-native archs
(sparc64:
http://build-failures.rhaalovely.net/sparc64/2021-12-04/devel/dune.log)
Only a REVISION bump is needed, no need for conflict markers as the files
stay in the -private subpackage.
A bit too hasty, the -configurator also needs a similar tweak.
ok?
Thanks and OK chrisz@. Seems like I missed those .cmx in some previous
update.
Christopher
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/devel/dune/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile 10 Dec 2021 04:10:59 -0000 1.13
+++ Makefile 19 Dec 2021 18:46:04 -0000
@@ -5,9 +5,9 @@ MULTI_PACKAGES = -main -private -configu
COMMENT-main = OCaml build system
COMMENT-private = private libraries of the dune build system
COMMENT-configurator = OCaml library for gathering system configuration
-REVISION-configurator = 0
+REVISION-configurator = 1
REVISION-main = 0
-REVISION-private = 0
+REVISION-private = 1
VERSION = 2.7.0
Index: pkg/PFRAG.native-configurator
===================================================================
RCS file: /home/cvs/ports/devel/dune/pkg/PFRAG.native-configurator,v
retrieving revision 1.1
diff -u -p -r1.1 PFRAG.native-configurator
--- pkg/PFRAG.native-configurator 4 Dec 2021 03:05:30 -0000 1.1
+++ pkg/PFRAG.native-configurator 19 Dec 2021 18:45:40 -0000
@@ -4,6 +4,7 @@ lib/ocaml/dune-configurator/configurator
lib/ocaml/dune-configurator/configurator.cmx
lib/ocaml/dune-configurator/configurator.cmxa
lib/ocaml/dune-configurator/configurator__.cmx
+lib/ocaml/dune-configurator/configurator__Csexp.cmx
lib/ocaml/dune-configurator/configurator__Dune_lang.cmx
lib/ocaml/dune-configurator/configurator__Extract_obj.cmx
lib/ocaml/dune-configurator/configurator__Import.cmx
Index: pkg/PFRAG.native-private
===================================================================
RCS file: /home/cvs/ports/devel/dune/pkg/PFRAG.native-private,v
retrieving revision 1.1
diff -u -p -r1.1 PFRAG.native-private
--- pkg/PFRAG.native-private 4 Dec 2021 03:05:30 -0000 1.1
+++ pkg/PFRAG.native-private 19 Dec 2021 18:45:41 -0000
@@ -80,6 +80,7 @@ lib/ocaml/dune-private-libs/stdune/stdun
lib/ocaml/dune-private-libs/stdune/stdune__Fdecl.cmx
lib/ocaml/dune-private-libs/stdune/stdune__Filename.cmx
lib/ocaml/dune-private-libs/stdune/stdune__Float.cmx
+lib/ocaml/dune-private-libs/stdune/stdune__Fpath.cmx
lib/ocaml/dune-private-libs/stdune/stdune__Hashable.cmx
lib/ocaml/dune-private-libs/stdune/stdune__Hashtbl.cmx
lib/ocaml/dune-private-libs/stdune/stdune__Hashtbl_intf.cmx
@@ -109,6 +110,7 @@ lib/ocaml/dune-private-libs/stdune/stdun
lib/ocaml/dune-private-libs/stdune/stdune__Poly.cmx
lib/ocaml/dune-private-libs/stdune/stdune__Pp.cmx
lib/ocaml/dune-private-libs/stdune/stdune__Proc.cmx
+lib/ocaml/dune-private-libs/stdune/stdune__Queue.cmx
lib/ocaml/dune-private-libs/stdune/stdune__Result.cmx
lib/ocaml/dune-private-libs/stdune/stdune__Scanf.cmx
lib/ocaml/dune-private-libs/stdune/stdune__Seq.cmx
@@ -122,6 +124,7 @@ lib/ocaml/dune-private-libs/stdune/stdun
lib/ocaml/dune-private-libs/stdune/stdune__String_split.cmx
lib/ocaml/dune-private-libs/stdune/stdune__Sys.cmx
lib/ocaml/dune-private-libs/stdune/stdune__Table.cmx
+lib/ocaml/dune-private-libs/stdune/stdune__Temp.cmx
lib/ocaml/dune-private-libs/stdune/stdune__Top_closure.cmx
lib/ocaml/dune-private-libs/stdune/stdune__Top_closure_intf.cmx
lib/ocaml/dune-private-libs/stdune/stdune__Tuple.cmx
Index: pkg/PLIST-configurator
===================================================================
RCS file: /home/cvs/ports/devel/dune/pkg/PLIST-configurator,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-configurator
--- pkg/PLIST-configurator 4 Dec 2021 03:05:30 -0000 1.1
+++ pkg/PLIST-configurator 19 Dec 2021 18:45:43 -0000
@@ -16,7 +16,6 @@ lib/ocaml/dune-configurator/configurator
lib/ocaml/dune-configurator/configurator__.ml
lib/ocaml/dune-configurator/configurator__Csexp.cmt
lib/ocaml/dune-configurator/configurator__Csexp.cmti
-lib/ocaml/dune-configurator/configurator__Csexp.cmx
lib/ocaml/dune-configurator/configurator__Dune_lang.cmt
lib/ocaml/dune-configurator/configurator__Dune_lang.cmti
lib/ocaml/dune-configurator/configurator__Extract_obj.cmi
Index: pkg/PLIST-private
===================================================================
RCS file: /home/cvs/ports/devel/dune/pkg/PLIST-private,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-private
--- pkg/PLIST-private 4 Dec 2021 03:05:30 -0000 1.1
+++ pkg/PLIST-private 19 Dec 2021 18:45:45 -0000
@@ -389,7 +389,6 @@ lib/ocaml/dune-private-libs/stdune/stdun
lib/ocaml/dune-private-libs/stdune/stdune__Fpath.cmi
lib/ocaml/dune-private-libs/stdune/stdune__Fpath.cmt
lib/ocaml/dune-private-libs/stdune/stdune__Fpath.cmti
-lib/ocaml/dune-private-libs/stdune/stdune__Fpath.cmx
lib/ocaml/dune-private-libs/stdune/stdune__Hashable.cmi
lib/ocaml/dune-private-libs/stdune/stdune__Hashable.cmt
lib/ocaml/dune-private-libs/stdune/stdune__Hashtbl.cmi
@@ -472,7 +471,6 @@ lib/ocaml/dune-private-libs/stdune/stdun
lib/ocaml/dune-private-libs/stdune/stdune__Queue.cmi
lib/ocaml/dune-private-libs/stdune/stdune__Queue.cmt
lib/ocaml/dune-private-libs/stdune/stdune__Queue.cmti
-lib/ocaml/dune-private-libs/stdune/stdune__Queue.cmx
lib/ocaml/dune-private-libs/stdune/stdune__Result.cmi
lib/ocaml/dune-private-libs/stdune/stdune__Result.cmt
lib/ocaml/dune-private-libs/stdune/stdune__Result.cmti
@@ -514,7 +512,6 @@ lib/ocaml/dune-private-libs/stdune/stdun
lib/ocaml/dune-private-libs/stdune/stdune__Temp.cmi
lib/ocaml/dune-private-libs/stdune/stdune__Temp.cmt
lib/ocaml/dune-private-libs/stdune/stdune__Temp.cmti
-lib/ocaml/dune-private-libs/stdune/stdune__Temp.cmx
lib/ocaml/dune-private-libs/stdune/stdune__Top_closure.cmi
lib/ocaml/dune-private-libs/stdune/stdune__Top_closure.cmt
lib/ocaml/dune-private-libs/stdune/stdune__Top_closure.cmti
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
--
http://gmerlin.de
OpenPGP: http://gmerlin.de/christopher.pub
CB07 DA40 B0B6 571D 35E2 0DEF 87E2 92A7 13E5 DEE1
