From 4e1547e8622403357ec6a3c01ba2063920c2fa94 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 18 Nov 2020 16:39:49 +0100 Subject: [PATCH] xen: remove obsolete unsafe-string patch. --- srcpkgs/xen/patches/ocmal-unsafe-string.patch | 24 ------------------- srcpkgs/xen/template | 2 +- 2 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 srcpkgs/xen/patches/ocmal-unsafe-string.patch diff --git a/srcpkgs/xen/patches/ocmal-unsafe-string.patch b/srcpkgs/xen/patches/ocmal-unsafe-string.patch deleted file mode 100644 index d5d89da21d6..00000000000 --- a/srcpkgs/xen/patches/ocmal-unsafe-string.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 18c163276f9b1f7f94e17a4f51f37a58b1ee4052 Mon Sep 17 00:00:00 2001 -From: John Thomson -Date: Thu, 25 Jan 2018 17:06:56 +1000 -Subject: [PATCH] Fix ocaml 4.06.0 build, use unsafe strings - ---- - tools/ocaml/common.make | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tools/ocaml/common.make b/tools/ocaml/common.make -index d5478f6..21ac33c 100644 ---- tools/ocaml/common.make -+++ tools/ocaml/common.make -@@ -12,8 +12,8 @@ OCAMLFIND ?= ocamlfind - CFLAGS += -fPIC -Werror -I$(shell ocamlc -where) - - OCAMLOPTFLAG_G := $(shell $(OCAMLOPT) -h 2>&1 | sed -n 's/^ *\(-g\) .*/\1/p') --OCAMLOPTFLAGS = $(OCAMLOPTFLAG_G) -ccopt "$(LDFLAGS)" -dtypes $(OCAMLINCLUDE) -cc $(CC) -w F -warn-error F --OCAMLCFLAGS += -g $(OCAMLINCLUDE) -w F -warn-error F -+OCAMLOPTFLAGS = $(OCAMLOPTFLAG_G) -ccopt "$(LDFLAGS)" -dtypes $(OCAMLINCLUDE) -cc $(CC) -w F -warn-error F -unsafe-string -+OCAMLCFLAGS += -g $(OCAMLINCLUDE) -w F -warn-error F -unsafe-string - - VERSION := 4.1 - diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template index 928ccb505ca..5e6381480e3 100644 --- a/srcpkgs/xen/template +++ b/srcpkgs/xen/template @@ -1,7 +1,7 @@ # Template file for 'xen' pkgname=xen version=4.14.0 -revision=3 +revision=4 # grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot _git_tag_ipxe=4bd064de239dab2426b31c9789a1f4d78087dc63 # TODO: arm / aarch64