Sat Jan 16 16:35:04 2021 UTC ()
Pullup ticket #6395 - requested by bouyer
sysutils/xentools413: build fix

Revisions pulled up:
- sysutils/xentools413/distinfo                                 1.7
- sysutils/xentools413/patches/patch-tools_ocaml_Makefile.rules 1.1
- sysutils/xentools413/patches/patch-tools_ocaml_common.make    1.2

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	bouyer
   Date:		Fri Jan  8 22:08:46 UTC 2021

   Modified Files:
   	pkgsrc/sysutils/xentools413: distinfo
   	pkgsrc/sysutils/xentools413/patches: patch-tools_ocaml_common.make
   Added Files:
   	pkgsrc/sysutils/xentools413/patches: patch-tools_ocaml_Makefile.rules

   Log Message:
   Fix build with newer ocaml, from Chavdar Ivanov

   To generate a diff of this commit:
   cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/xentools413/distinfo
   cvs rdiff -u -r0 -r1.1 \
       pkgsrc/sysutils/xentools413/patches/patch-tools_ocaml_Makefile.rules
   cvs rdiff -u -r1.1 -r1.2 \
       pkgsrc/sysutils/xentools413/patches/patch-tools_ocaml_common.make


(spz)
diff -r1.6 -r1.6.2.1 pkgsrc/sysutils/xentools413/distinfo
diff -r0 -r1.1.2.2 pkgsrc/sysutils/xentools413/patches/patch-tools_ocaml_Makefile.rules
diff -r1.1 -r1.1.6.1 pkgsrc/sysutils/xentools413/patches/patch-tools_ocaml_common.make
cvs diff -r1.6 -r1.6.2.1 pkgsrc/sysutils/xentools413/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools413/distinfo 2020/12/16 17:17:08 1.6
+++ pkgsrc/sysutils/xentools413/distinfo 2021/01/16 16:35:04 1.6.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.6 2020/12/16 17:17:08 bouyer Exp $ 1$NetBSD: distinfo,v 1.6.2.1 2021/01/16 16:35:04 spz Exp $
2 2
3SHA1 (xen413/ipxe-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz) = b78d21457bc07b4c4d3e770109c169ddafdacdf5 3SHA1 (xen413/ipxe-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz) = b78d21457bc07b4c4d3e770109c169ddafdacdf5
4RMD160 (xen413/ipxe-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz) = 846dbcc0f56e87fca8c87b00ca2ed031471d4246 4RMD160 (xen413/ipxe-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz) = 846dbcc0f56e87fca8c87b00ca2ed031471d4246
5SHA512 (xen413/ipxe-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz) = 0d96236385d241fdddafc88e8b4dac37298f2371b0c61055b78d6ce794166559127de2c110409c55738ca16c4a9e9e1834b03f7a2de85729d0a66cf5c313c9e8 5SHA512 (xen413/ipxe-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz) = 0d96236385d241fdddafc88e8b4dac37298f2371b0c61055b78d6ce794166559127de2c110409c55738ca16c4a9e9e1834b03f7a2de85729d0a66cf5c313c9e8
6Size (xen413/ipxe-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz) = 3814909 bytes 6Size (xen413/ipxe-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz) = 3814909 bytes
7SHA1 (xen413/seabios-1.12.1.tar.gz) = 229f14b55876a20e1b60be075e99569a6bd8967d 7SHA1 (xen413/seabios-1.12.1.tar.gz) = 229f14b55876a20e1b60be075e99569a6bd8967d
8RMD160 (xen413/seabios-1.12.1.tar.gz) = d7e778971c68454b27730213b5d72c0600e77344 8RMD160 (xen413/seabios-1.12.1.tar.gz) = d7e778971c68454b27730213b5d72c0600e77344
9SHA512 (xen413/seabios-1.12.1.tar.gz) = 58755ce842adcb99c0f2f3ebbf9ec6d4a5072753966ab46805a96db1570847b109a90e6e03d61f9088ef877ca8ba96a8006777dc38ec434fce6b487f6c1f91d0 9SHA512 (xen413/seabios-1.12.1.tar.gz) = 58755ce842adcb99c0f2f3ebbf9ec6d4a5072753966ab46805a96db1570847b109a90e6e03d61f9088ef877ca8ba96a8006777dc38ec434fce6b487f6c1f91d0
10Size (xen413/seabios-1.12.1.tar.gz) = 613450 bytes 10Size (xen413/seabios-1.12.1.tar.gz) = 613450 bytes
11SHA1 (xen413/xen-4.13.2.tar.gz) = d514f1de9582c58676420bb2c9fb1c765b44fbff 11SHA1 (xen413/xen-4.13.2.tar.gz) = d514f1de9582c58676420bb2c9fb1c765b44fbff
12RMD160 (xen413/xen-4.13.2.tar.gz) = 96727c20bd84338f8c67c7c584c01ef877bbcb18 12RMD160 (xen413/xen-4.13.2.tar.gz) = 96727c20bd84338f8c67c7c584c01ef877bbcb18
13SHA512 (xen413/xen-4.13.2.tar.gz) = cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3 13SHA512 (xen413/xen-4.13.2.tar.gz) = cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3
14Size (xen413/xen-4.13.2.tar.gz) = 39037826 bytes 14Size (xen413/xen-4.13.2.tar.gz) = 39037826 bytes
@@ -60,27 +60,28 @@ SHA1 (patch-tools_libs_foreignmemory_Mak @@ -60,27 +60,28 @@ SHA1 (patch-tools_libs_foreignmemory_Mak
60SHA1 (patch-tools_libs_foreignmemory_netbsd.c) = a8eaa785fc3d46cce943f6f205066ff175f7f0e6 60SHA1 (patch-tools_libs_foreignmemory_netbsd.c) = a8eaa785fc3d46cce943f6f205066ff175f7f0e6
61SHA1 (patch-tools_libs_foreignmemory_private.h) = 4dfd16cb0bc14882f9aba8ccbd543b09e7959499 61SHA1 (patch-tools_libs_foreignmemory_private.h) = 4dfd16cb0bc14882f9aba8ccbd543b09e7959499
62SHA1 (patch-tools_libs_gnttab_Makefile) = 613a1e1867c5110f0fcf85a3c766306c02a1f001 62SHA1 (patch-tools_libs_gnttab_Makefile) = 613a1e1867c5110f0fcf85a3c766306c02a1f001
63SHA1 (patch-tools_libs_gnttab_netbsd.c) = fecbb0d41365fc49621964dbf8d3b3fcbfddb5d3 63SHA1 (patch-tools_libs_gnttab_netbsd.c) = fecbb0d41365fc49621964dbf8d3b3fcbfddb5d3
64SHA1 (patch-tools_libxc_xc_private.h) = b627c3f92a6e74e3708bbc110d0b6a4d6ea64c37 64SHA1 (patch-tools_libxc_xc_private.h) = b627c3f92a6e74e3708bbc110d0b6a4d6ea64c37
65SHA1 (patch-tools_libxl_libxl__create.c) = 09cd562f0839dda6f92d63d8fc8ed6de08dd82a8 65SHA1 (patch-tools_libxl_libxl__create.c) = 09cd562f0839dda6f92d63d8fc8ed6de08dd82a8
66SHA1 (patch-tools_libxl_libxl__qmp.c) = d7507da61fedca0b2eb468a2c18738324c9aebd9 66SHA1 (patch-tools_libxl_libxl__qmp.c) = d7507da61fedca0b2eb468a2c18738324c9aebd9
67SHA1 (patch-tools_libxl_libxl_dm.c) = 7067dd7f99d31617074442a4e7c1b4d4389fb17d 67SHA1 (patch-tools_libxl_libxl_dm.c) = 7067dd7f99d31617074442a4e7c1b4d4389fb17d
68SHA1 (patch-tools_libxl_libxl_dom.c) = 0c4a96523d13de65aaa71ef705c3579ee8d641f3 68SHA1 (patch-tools_libxl_libxl_dom.c) = 0c4a96523d13de65aaa71ef705c3579ee8d641f3
69SHA1 (patch-tools_libxl_libxl_event.c) = 8147122d03102eccc45c48a7d6ca1aa5d6286040 69SHA1 (patch-tools_libxl_libxl_event.c) = 8147122d03102eccc45c48a7d6ca1aa5d6286040
70SHA1 (patch-tools_libxl_libxl_internal.h) = 31da26f2121fe2a1928d75f719554ed9389c187b 70SHA1 (patch-tools_libxl_libxl_internal.h) = 31da26f2121fe2a1928d75f719554ed9389c187b
71SHA1 (patch-tools_libxl_libxl_netbsd.c) = e2289fabc37bbb0fa078ce9a7256229f998c5982 71SHA1 (patch-tools_libxl_libxl_netbsd.c) = e2289fabc37bbb0fa078ce9a7256229f998c5982
72SHA1 (patch-tools_libxl_libxl_uuid.c) = 1eb8c027dbeb7e67df7475ee6e4d87220140c65b 72SHA1 (patch-tools_libxl_libxl_uuid.c) = 1eb8c027dbeb7e67df7475ee6e4d87220140c65b
73SHA1 (patch-tools_ocaml_common.make) = 4b845bdf3a013852109749ee18dfe28e3440d951 73SHA1 (patch-tools_ocaml_Makefile.rules) = 2198396f896999adb8ea05f100a0a5ec36733b1a
 74SHA1 (patch-tools_ocaml_common.make) = 0e243aff97d8e8c6349f548dbbab878f3ca1acb6
74SHA1 (patch-tools_ocaml_libs_eventchn_xeneventchn_stubs.c) = 371e45af87b4432aedeaba1871aa94a4f492e011 75SHA1 (patch-tools_ocaml_libs_eventchn_xeneventchn_stubs.c) = 371e45af87b4432aedeaba1871aa94a4f492e011
75SHA1 (patch-tools_ocaml_xenstored_Makefile) = b267702cf4090c7b45bba530e60327fced24e3e5 76SHA1 (patch-tools_ocaml_xenstored_Makefile) = b267702cf4090c7b45bba530e60327fced24e3e5
76SHA1 (patch-tools_ocaml_xenstored_utils.ml) = 5e85a0039d668c9b533e8deaa65fcdab9a5ad4c7 77SHA1 (patch-tools_ocaml_xenstored_utils.ml) = 5e85a0039d668c9b533e8deaa65fcdab9a5ad4c7
77SHA1 (patch-tools_qemu-xen-traditional_Makefile) = 5fbb55bf84f9856043be301d5d06530190fe9a60 78SHA1 (patch-tools_qemu-xen-traditional_Makefile) = 5fbb55bf84f9856043be301d5d06530190fe9a60
78SHA1 (patch-tools_qemu-xen-traditional_block-raw-posix.c) = eb3efea4b0c7fd744f627f1926fca737ba826b99 79SHA1 (patch-tools_qemu-xen-traditional_block-raw-posix.c) = eb3efea4b0c7fd744f627f1926fca737ba826b99
79SHA1 (patch-tools_qemu-xen-traditional_configure) = 6a42dcac010f90439a347c0f6e886b07185cb19a 80SHA1 (patch-tools_qemu-xen-traditional_configure) = 6a42dcac010f90439a347c0f6e886b07185cb19a
80SHA1 (patch-tools_qemu-xen-traditional_hw_e1000.c) = ec86584529cc743ea27768ad1fab523ee9fb6bea 81SHA1 (patch-tools_qemu-xen-traditional_hw_e1000.c) = ec86584529cc743ea27768ad1fab523ee9fb6bea
81SHA1 (patch-tools_qemu-xen-traditional_hw_ide.c) = b541546390c6d142bc6079dbd51cfd65b5223e9e 82SHA1 (patch-tools_qemu-xen-traditional_hw_ide.c) = b541546390c6d142bc6079dbd51cfd65b5223e9e
82SHA1 (patch-tools_qemu-xen-traditional_hw_pass-through.c) = 45848fb5038bdd6def218b35dd0a6496a14102f1 83SHA1 (patch-tools_qemu-xen-traditional_hw_pass-through.c) = 45848fb5038bdd6def218b35dd0a6496a14102f1
83SHA1 (patch-tools_qemu-xen-traditional_hw_pass-through.h) = 6edb7a9a03d99b84801bf595c4d68acbc361bb4b 84SHA1 (patch-tools_qemu-xen-traditional_hw_pass-through.h) = 6edb7a9a03d99b84801bf595c4d68acbc361bb4b
84SHA1 (patch-tools_qemu-xen-traditional_hw_piix4acpi.c) = 280265db035e239b173efd9d63b629201d2c0cfa 85SHA1 (patch-tools_qemu-xen-traditional_hw_piix4acpi.c) = 280265db035e239b173efd9d63b629201d2c0cfa
85SHA1 (patch-tools_qemu-xen-traditional_hw_pt-graphics.c) = b9c18042f40ccacb3f24ab0f1e3c6e1a5bf5521a 86SHA1 (patch-tools_qemu-xen-traditional_hw_pt-graphics.c) = b9c18042f40ccacb3f24ab0f1e3c6e1a5bf5521a
86SHA1 (patch-tools_qemu-xen-traditional_hw_pt-msi.c) = a953380dbc3e64528c39e26d2c45c0cbd3e4d738 87SHA1 (patch-tools_qemu-xen-traditional_hw_pt-msi.c) = a953380dbc3e64528c39e26d2c45c0cbd3e4d738
File Added: pkgsrc/sysutils/xentools413/patches/patch-tools_ocaml_Makefile.rules
$NetBSD: patch-tools_ocaml_Makefile.rules,v 1.1.2.2 2021/01/16 16:35:04 spz Exp $

--- tools/ocaml/Makefile.rules.orig	2021-01-08 22:48:10.638776688 +0100
+++ tools/ocaml/Makefile.rules	2021-01-08 22:49:05.627085243 +0100
@@ -34,7 +34,7 @@
 	$(call quiet-command, $(OCAMLYACC) -q $<,MLYACC,$@)
 
 %.o: %.c
-	$(call quiet-command, $(CC) $(CFLAGS) -c -o $@ $<,CC,$@)
+	$(call quiet-command, $(CC) $(CFLAGS) -Wno-error=discarded-qualifiers -c -o $@ $<,CC,$@)
 
 META: META.in
 	sed 's/@VERSION@/$(VERSION)/g' < $< $o
cvs diff -r1.1 -r1.1.6.1 pkgsrc/sysutils/xentools413/patches/patch-tools_ocaml_common.make (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools413/patches/patch-tools_ocaml_common.make 2020/05/26 11:12:11 1.1
+++ pkgsrc/sysutils/xentools413/patches/patch-tools_ocaml_common.make 2021/01/16 16:35:04 1.1.6.1
@@ -1,31 +1,23 @@ @@ -1,31 +1,23 @@
1$NetBSD: patch-tools_ocaml_common.make,v 1.1 2020/05/26 11:12:11 bouyer Exp $ 1$NetBSD: patch-tools_ocaml_common.make,v 1.1.6.1 2021/01/16 16:35:04 spz Exp $
2 2
3Handle ocaml-findlib 1.7.3 already appending destdir 3Handle ocaml-findlib 1.7.3 already appending destdir
4Add -unsafe-string to fix build with ocaml-4.06.0 and later 
5 4
6--- tools/ocaml/common.make.orig 2018-01-23 13:49:58.000000000 +0000 5--- tools/ocaml/common.make.orig 2020-10-30 12:24:39.000000000 +0100
7+++ tools/ocaml/common.make 6+++ tools/ocaml/common.make 2021-01-08 22:09:56.936759911 +0100
8@@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk 7@@ -3,7 +3,7 @@
9 CC ?= gcc 8 CC ?= gcc
10 OCAMLOPT ?= ocamlopt 9 OCAMLOPT ?= ocamlopt
11 OCAMLC ?= ocamlc 10 OCAMLC ?= ocamlc
12-OCAMLMKLIB ?= ocamlmklib 11-OCAMLMKLIB ?= ocamlmklib
13+OCAMLMKLIB ?= ocamlmklib -elfmode 12+OCAMLMKLIB ?= ocamlmklib -elfmode
14 OCAMLDEP ?= ocamldep 13 OCAMLDEP ?= ocamldep
15 OCAMLLEX ?= ocamllex 14 OCAMLLEX ?= ocamllex
16 OCAMLYACC ?= ocamlyacc 15 OCAMLYACC ?= ocamlyacc
17@@ -12,11 +12,11 @@ OCAMLFIND ?= ocamlfind 16@@ -17,6 +17,6 @@
18 CFLAGS += -fPIC -Werror -I$(shell ocamlc -where) 
19  
20 OCAMLOPTFLAG_G := $(shell $(OCAMLOPT) -h 2>&1 | sed -n 's/^ *\(-g\) .*/\1/p') 
21-OCAMLOPTFLAGS = $(OCAMLOPTFLAG_G) -ccopt "$(LDFLAGS)" -dtypes $(OCAMLINCLUDE) -cc $(CC) -w F -warn-error F 
22-OCAMLCFLAGS += -g $(OCAMLINCLUDE) -w F -warn-error F 
23+OCAMLOPTFLAGS = $(OCAMLOPTFLAG_G) -unsafe-string -ccopt "$(LDFLAGS)" -dtypes $(OCAMLINCLUDE) -cc $(CC) -w F -warn-error F 
24+OCAMLCFLAGS += -unsafe-string -g $(OCAMLINCLUDE) -w F -warn-error F 
25  17
26 VERSION := 4.1 18 VERSION := 4.1
27  19
28-OCAMLDESTDIR ?= $(DESTDIR)$(shell $(OCAMLFIND) printconf destdir) 20-OCAMLDESTDIR ?= $(DESTDIR)$(shell $(OCAMLFIND) printconf destdir)
29+OCAMLDESTDIR ?= $(shell $(OCAMLFIND) printconf destdir) 21+OCAMLDESTDIR ?= $(shell $(OCAMLFIND) printconf destdir)
30  22
31 o= >$@.new && mv -f $@.new $@ 23 o= >$@.new && mv -f $@.new $@