* [PR PATCH] Ocaml414
@ 2022-04-13 19:39 leahneukirchen
2022-04-13 19:40 ` [PR PATCH] [Updated] OCaml 4.14 leahneukirchen
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: leahneukirchen @ 2022-04-13 19:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 575 bytes --]
There is a new pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages ocaml414
https://github.com/void-linux/void-packages/pull/36683
Ocaml414
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
TBD:
- [ ] zeroinstall: opam doesn't work with 4.14 yet?
- [ ] xen: FTBFS due to as86 missing, unrelated?
A patch file from https://github.com/void-linux/void-packages/pull/36683.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ocaml414-36683.patch --]
[-- Type: text/x-diff, Size: 20672 bytes --]
From 65c8f3e719885272d407521010a704ae661bed73 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 12:52:43 +0200
Subject: [PATCH 01/24] gucci: update to 1.5.4.
---
srcpkgs/gucci/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index a4d816647e74..37773ceba896 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
# Template file for 'gucci'
pkgname=gucci
-version=1.5.3
+version=1.5.4
revision=1
build_style=go
go_import_path="github.com/noqcks/gucci"
@@ -10,8 +10,8 @@ short_desc="Simple CLI templating tool written in Go"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://github.com/noqcks/gucci"
-distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=f52c12fbf566d42e666618d24258488eac6035a76369c2db4b741fed8792de76
+distfiles="https://github.com/noqcks/gucci/archive/refs/tags/${version}.tar.gz"
+checksum=c6e30e088c341eb6988e2b50fc477deef81882d8a517e130a8eef22c81f32823
post_install() {
vlicense LICENSE
From 379d07f6e5ea947f9a813c8e950ac1091a1d42ed Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:45:24 +0200
Subject: [PATCH 02/24] ocaml: update to 4.14.
---
srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch | 16 ++++++++--------
srcpkgs/ocaml/template | 6 +++---
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
index 333276741c7d..a26f6a639e18 100644
--- a/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
+++ b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
@@ -18,25 +18,25 @@
.globl caml_system__frametable
.type caml_system__frametable, @object
caml_system__frametable:
---- ocaml-4.11.0/configure.ac
-+++ ocaml-4.11.0/configure.ac
+--- ocaml-4.14.0/configure.ac
++++ ocaml-4.14.0/configure.ac
@@ -1006,7 +1006,7 @@ AS_IF([test $arch != "none" && $arch64 ],
# e.g. Ubuntu >= 17.10 for i386, which uses the glibc dynamic loader.
AS_CASE([$arch],
-- [amd64|s390x|none],
-+ [amd64|s390x|power|none],
+- [amd64|arm64|s390x|none],
++ [amd64|arm64|s390x|power|none],
# ocamlopt generates PIC code or doesn't generate code at all
[],
[AS_CASE([$host],
---- ocaml-4.11.0/configure
-+++ ocaml-4.11.0/configure
+--- ocaml-4.14.0/configure
++++ ocaml-4.14.0/configure
@@ -13886,7 +13886,7 @@
# e.g. Ubuntu >= 17.10 for i386, which uses the glibc dynamic loader.
case $arch in #(
-- amd64|s390x|none) :
-+ amd64|s390x|power|none) :
+- amd64|arm64|s390x|none) :
++ amd64|arm64|s390x|power|none) :
# ocamlopt generates PIC code or doesn't generate code at all
;; #(
*) :
diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template
index 629c13791dfe..10d7d5ddcd82 100644
--- a/srcpkgs/ocaml/template
+++ b/srcpkgs/ocaml/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml'
pkgname=ocaml
-version=4.13.1
-revision=2
+version=4.14
+revision=1
build_style="gnu-configure"
configure_args="--with-pic --libdir=/usr/lib/ocaml"
make_build_target="world.opt"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="QPL-1.0, LGPL-2.1-only"
homepage="http://ocaml.org/"
distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=194c7988cc1fd1c64f53f32f2f7551e5309e44d914d6efc7e2e4d002296aeac4
+checksum=8709ed83501979e23d65c93a1db66ae7cd3e2d56927bd95aaa0a2c837c2c50e4
nocross=yes
export ASPP="cc -c"
From 2621c8f86de69b42306334de6bccce17c54e37fc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:47:06 +0200
Subject: [PATCH 03/24] ocaml-findlib: update to 1.9.3.
---
srcpkgs/ocaml-findlib/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template
index 73cca5a2cafa..04be12e64f51 100644
--- a/srcpkgs/ocaml-findlib/template
+++ b/srcpkgs/ocaml-findlib/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml-findlib'
pkgname=ocaml-findlib
-version=1.9.1
-revision=3
+version=1.9.3
+revision=1
wrksrc="findlib-${version}"
build_style=configure
configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man"
@@ -12,7 +12,7 @@ maintainer="John Regan <john@jrjrtech.com>"
license="MIT"
homepage="http://projects.camlcity.org/projects/findlib.html"
distfiles="http://download.camlcity.org/download/findlib-${version}.tar.gz"
-checksum=2b42b8bd54488d64c4bf3cb7054b4b37bd30c1dc12bd431ea1e4d7ad8a980fe2
+checksum=c310fcb62838d9e50f0b6d6c5ceefcbe4fe056f72496950ae7d5c6cdaae2cc41
nocross=yes
nopie=yes
disable_parallel_build=yes
From 7fd75a0484daca696d29b87da66ee04800c5f6ba Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:48:00 +0200
Subject: [PATCH 04/24] ocaml-num: rebuild for ocaml-4.14_1.
---
srcpkgs/ocaml-num/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ocaml-num/template b/srcpkgs/ocaml-num/template
index bfce4e7baf91..739ffcf5d419 100644
--- a/srcpkgs/ocaml-num/template
+++ b/srcpkgs/ocaml-num/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml-num'
pkgname=ocaml-num
version=1.4
-revision=3
+revision=4
wrksrc="num-${version}"
build_style=gnu-makefile
make_install_target="findlib-install"
From e514c1c14c55d270966d4ce9c919fa99e7b4b475 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:49:19 +0200
Subject: [PATCH 05/24] ocaml-zarith: rebuild for ocaml-4.14_1.
---
srcpkgs/ocaml-zarith/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ocaml-zarith/template b/srcpkgs/ocaml-zarith/template
index d6c12772723d..936b5cd3f607 100644
--- a/srcpkgs/ocaml-zarith/template
+++ b/srcpkgs/ocaml-zarith/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml-zarith'
pkgname=ocaml-zarith
version=1.12
-revision=3
+revision=4
wrksrc="Zarith-release-${version}"
build_style=configure
make_check_target="tests"
From 5e51cf46342ea6932c3c1e6eb690141c98e69be7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:50:43 +0200
Subject: [PATCH 06/24] ocamlbuild: rebuild for ocaml-4.14_1.
---
srcpkgs/ocamlbuild/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ocamlbuild/template b/srcpkgs/ocamlbuild/template
index 077d5cc7f632..b1349909f784 100644
--- a/srcpkgs/ocamlbuild/template
+++ b/srcpkgs/ocamlbuild/template
@@ -1,7 +1,7 @@
# Template file for 'ocamlbuild'
pkgname=ocamlbuild
version=0.14.1
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="PREFIX=/usr"
make_install_args="PREFIX=/usr"
@@ -13,3 +13,5 @@ homepage="https://github.com/ocaml/ocamlbuild"
distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
checksum=4e1279ff0ef80c862eaa5207a77020d741e89ef94f0e4a92a37c4188dbf08256
nocross=yes
+
+export CHECK_IF_PREINSTALLED=false
From 275f18ccd1daadc714be7ef473e14ca2bd134b3e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:51:59 +0200
Subject: [PATCH 07/24] ocaml-stdcompat: update to 18.
---
srcpkgs/ocaml-stdcompat/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ocaml-stdcompat/template b/srcpkgs/ocaml-stdcompat/template
index 2035a9a2c4fa..65a0d6fbc78f 100644
--- a/srcpkgs/ocaml-stdcompat/template
+++ b/srcpkgs/ocaml-stdcompat/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml-stdcompat'
pkgname=ocaml-stdcompat
-version=16
-revision=2
+version=18
+revision=1
wrksrc="stdcompat-${version}"
build_style=gnu-configure
configure_args="--libdir=/usr/lib/ocaml"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-2-Clause"
homepage="https://github.com/thierry-martinez/stdcompat"
distfiles="https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz"
-checksum=100152e25f138351cb265146cd8717fa9dbfbff54b48ce771e30a4e05fc1ec09
+checksum=483a8d526eb19709a1a3092fb8978302e3a9d3bb783d807fb9ee53d96c3ec607
nocross=yes
disable_parallel_build=yes
From 39e57ee501fc8f3b79d61b738fb1a9de2720181a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:53:13 +0200
Subject: [PATCH 08/24] hivex: rebuild for ocaml-4.14_1.
---
srcpkgs/hivex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 448c06ddc9fa..f6f12d1b70f3 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
# Template file for 'hivex'
pkgname=hivex
version=1.3.21
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--disable-ocaml" # currently ocaml is broken
hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
From 7653912ad678d40c0e41513b13eceb5031eae88f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:53:32 +0200
Subject: [PATCH 09/24] opam: rebuild for ocaml-4.14_1.
---
srcpkgs/opam/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index 236a2f963b70..ca5c64092ac8 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
# Template file for 'opam'
pkgname=opam
version=2.1.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--docdir=/usr/share/doc/${pkgname}"
make_build_args="lib-ext all"
From f3dbb0acb97a1f7aec51a27d0247535bc85a78a1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:53:52 +0200
Subject: [PATCH 10/24] ocaml-lablgtk2: rebuild for ocaml-4.14_1.
---
srcpkgs/ocaml-lablgtk2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ocaml-lablgtk2/template b/srcpkgs/ocaml-lablgtk2/template
index c835e6b19d5d..6ff864eb1720 100644
--- a/srcpkgs/ocaml-lablgtk2/template
+++ b/srcpkgs/ocaml-lablgtk2/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml-lablgtk2'
pkgname=ocaml-lablgtk2
version=2.18.10
-revision=4
+revision=5
wrksrc="lablgtk-${version}"
build_style=gnu-configure
configure_args="--without-glade --without-gnomeui --without-gtksourceview"
From 45619d44164e2edfb0bca7bb189887c0b105be81 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:56:12 +0200
Subject: [PATCH 11/24] pdfsandwich: rebuild for ocaml-4.14_1.
---
srcpkgs/pdfsandwich/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pdfsandwich/template b/srcpkgs/pdfsandwich/template
index f3603e064c90..82f2f934fdc1 100644
--- a/srcpkgs/pdfsandwich/template
+++ b/srcpkgs/pdfsandwich/template
@@ -1,7 +1,7 @@
# Template file for 'pdfsandwich'
pkgname=pdfsandwich
version=0.1.7
-revision=5
+revision=6
build_style=gnu-configure
hostmakedepends="ocaml perl"
makedepends="ocaml"
From 869ca8b404f0ec217ec819dade26d1770dfd1835 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:56:17 +0200
Subject: [PATCH 12/24] supermin: rebuild for ocaml-4.14_1.
---
srcpkgs/supermin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supermin/template b/srcpkgs/supermin/template
index 357fc3f255f8..5f80c3515b3d 100644
--- a/srcpkgs/supermin/template
+++ b/srcpkgs/supermin/template
@@ -1,7 +1,7 @@
# Template file for 'supermin'
pkgname=supermin
version=5.2.2
-revision=1
+revision=2
_release_series=5.2-stable
build_style=gnu-configure
hostmakedepends="ocaml ocaml-findlib pkg-config e2fsprogs cpio perl"
From 228b373eef139cb7c7f98f7c2ac0cfedcd42506e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:56:24 +0200
Subject: [PATCH 13/24] z3: rebuild for ocaml-4.14_1.
---
srcpkgs/z3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index 2d5bf7a80954..dea059c98d0c 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,7 +1,7 @@
# Template file for 'z3'
pkgname=z3
version=4.8.15
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=configure
configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"
From d222dcc2b7aea4553633309e5e68db8a1ea855e3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:58:01 +0200
Subject: [PATCH 14/24] zeroinstall: rebuild for ocaml-4.14_1.
---
srcpkgs/zeroinstall/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index eb8e1ea24280..40d8740b1300 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -1,7 +1,7 @@
# Template file for 'zeroinstall'
pkgname=zeroinstall
version=2.17
-revision=5
+revision=6
wrksrc="0install-v${version}"
build_style=gnu-makefile
make_install_target="install_system"
From f722d2d20a30416f119ec666bd61d0e91d54b692 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:01:53 +0200
Subject: [PATCH 15/24] coccinelle: rebuild for ocaml-4.14_1.
---
srcpkgs/coccinelle/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/coccinelle/template b/srcpkgs/coccinelle/template
index 211c9bdb4394..709b45fd2f69 100644
--- a/srcpkgs/coccinelle/template
+++ b/srcpkgs/coccinelle/template
@@ -1,7 +1,7 @@
# Template file for 'coccinelle'
pkgname=coccinelle
version=1.1.0
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-pdflatex --enable-release --enable-opt
--with-python=/usr/bin/python3"
From 1ac76db8584db245f9fc15d1bdfdb7e1aa80c5fb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:03:56 +0200
Subject: [PATCH 16/24] libguestfs: rebuild for ocaml-4.14_1.
---
srcpkgs/libguestfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 8d669017077e..c6c56f8142b7 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,7 +1,7 @@
# Template file for 'libguestfs'
pkgname=libguestfs
version=1.48.0
-revision=1
+revision=2
_version_short=${version%.*}
build_style=gnu-configure
make_install_args="INSTALLDIRS=vendor"
From 88cdac01443969fcc024d1af4a2977b42abaf24c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:04:56 +0200
Subject: [PATCH 17/24] unison: rebuild for ocaml-4.14_1.
---
srcpkgs/unison/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template
index 783573c120ea..97eb209e2e8c 100644
--- a/srcpkgs/unison/template
+++ b/srcpkgs/unison/template
@@ -1,7 +1,7 @@
# Template file for 'unison'
pkgname=unison
version=2.52.0
-revision=1
+revision=2
hostmakedepends="ocaml"
short_desc="File-synchronization tool"
maintainer="allan <mail@may.mooo.com>"
From d1cbb13524a6f7e1234d258c90a674546f0da39d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:08:13 +0200
Subject: [PATCH 18/24] xen: rebuild for ocaml-4.14_1.
---
srcpkgs/xen/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index deb572fe8b9c..10b8684c9711 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -1,7 +1,7 @@
# Template file for 'xen'
pkgname=xen
version=4.14.1
-revision=5
+revision=6
# grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot
_git_tag_ipxe=4bd064de239dab2426b31c9789a1f4d78087dc63
# TODO: arm / aarch64
From 1e0a1d51ec797f66918fc6bc23456786a2c723e0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:08:51 +0200
Subject: [PATCH 19/24] camlp5: rebuild for ocaml-4.14_1.
---
srcpkgs/camlp5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template
index 2d07ecc842b4..74e0809e16d1 100644
--- a/srcpkgs/camlp5/template
+++ b/srcpkgs/camlp5/template
@@ -1,7 +1,7 @@
# Template file for 'camlp5'
pkgname=camlp5
version=8.00.03
-revision=1
+revision=2
wrksrc="camlp5-rel${version}"
build_style=configure
configure_args="-mandir /usr/share/man"
From 220ce9e24b37d98cccca179af6869d56916448c9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:12:31 +0200
Subject: [PATCH 20/24] dune: rebuild for ocaml-4.14_1.
---
srcpkgs/dune/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dune/template b/srcpkgs/dune/template
index 178746cfc292..30c34cb44c00 100644
--- a/srcpkgs/dune/template
+++ b/srcpkgs/dune/template
@@ -1,7 +1,7 @@
# Template file for 'dune'
pkgname=dune
version=3.0.3
-revision=1
+revision=2
makedepends="ocaml"
depends="ocaml"
short_desc="Composable build system for OCaml"
From 1bfbce2510d12cd8449b6ad57136b72c896f26c1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:18:07 +0200
Subject: [PATCH 21/24] New package: ocaml-camlp-streams-5.0
---
srcpkgs/ocaml-camlp-streams/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/ocaml-camlp-streams/template
diff --git a/srcpkgs/ocaml-camlp-streams/template b/srcpkgs/ocaml-camlp-streams/template
new file mode 100644
index 000000000000..ce728427d280
--- /dev/null
+++ b/srcpkgs/ocaml-camlp-streams/template
@@ -0,0 +1,22 @@
+# Template file for 'ocaml-camlp-streams'
+pkgname=ocaml-camlp-streams
+version=5.0
+revision=1
+wrksrc="camlp-streams-${version}"
+makedepends="ocaml dune"
+short_desc="Stream and Genlex libraries for use with Camlp4 and Camlp5"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="LGPL-2.1-only,OCaml-LGPL-linking-exception"
+homepage="https://github.com/ocaml/camlp-streams"
+distfiles="https://github.com/ocaml/camlp-streams/archive/v${version}.tar.gz"
+checksum=daa618bb57a876075a1801d9dcde7dee83635766185f565af913dff43ea4d226
+nocross=yes
+disable_parallel_build=yes
+
+do_build() {
+ dune build --display=short
+}
+do_install() {
+ dune install --prefix=/usr --destdir="$DESTDIR" \
+ --libdir=/usr/lib/ocaml --docdir=/usr/share/doc
+}
From 0a626a6af414fb6bb1ddf22faa856d339370aa3a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:23:36 +0200
Subject: [PATCH 22/24] camlp5: rebuild for ocaml-4.14_1.
---
srcpkgs/camlp5/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template
index 74e0809e16d1..1118f618ba1f 100644
--- a/srcpkgs/camlp5/template
+++ b/srcpkgs/camlp5/template
@@ -1,11 +1,12 @@
# Template file for 'camlp5'
pkgname=camlp5
version=8.00.03
-revision=2
+revision=3
wrksrc="camlp5-rel${version}"
build_style=configure
configure_args="-mandir /usr/share/man"
hostmakedepends="ocaml perl ocaml-findlib"
+makedepends="ocaml-camlp-streams"
short_desc="OCaml preprocessor and pretty-printer"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
From 8e5ce45bd14bca46580eb37b2ce4af3d2e345dd6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:23:46 +0200
Subject: [PATCH 23/24] coq: rebuild for ocaml-4.14_1.
---
srcpkgs/coq/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index fcfbc92cb2f6..5db6a99c5e5e 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,7 +1,7 @@
# Template file for 'coq'
pkgname=coq
version=8.15.1
-revision=1
+revision=2
hostmakedepends="camlp5 dune ocaml ocaml-findlib ocaml-num ocaml-zarith"
short_desc="Proof assistant written in OCaml"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From dad111686f1964852a4c9d3e56ce865c70f5bff2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:30:50 +0200
Subject: [PATCH 24/24] mathcomp: rebuild for coq-8.15.1_2.
---
srcpkgs/mathcomp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index 5946de08e18b..9bdea51dcf48 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -1,7 +1,7 @@
# Template file for 'mathcomp'
pkgname=mathcomp
version=1.14.0
-revision=1
+revision=2
wrksrc="math-comp-mathcomp-${version}"
build_wrksrc="mathcomp"
build_style=gnu-makefile
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] OCaml 4.14
2022-04-13 19:39 [PR PATCH] Ocaml414 leahneukirchen
@ 2022-04-13 19:40 ` leahneukirchen
2022-04-13 19:41 ` leahneukirchen
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: leahneukirchen @ 2022-04-13 19:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 582 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages ocaml414
https://github.com/void-linux/void-packages/pull/36683
OCaml 4.14
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
TBD:
- [ ] zeroinstall: opam doesn't work with 4.14 yet?
- [ ] xen: FTBFS due to as86 missing, unrelated?
A patch file from https://github.com/void-linux/void-packages/pull/36683.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ocaml414-36683.patch --]
[-- Type: text/x-diff, Size: 19550 bytes --]
From fe0a1d91c4bd689aca333068663c2936ab56c335 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:45:24 +0200
Subject: [PATCH 01/23] ocaml: update to 4.14.
---
srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch | 16 ++++++++--------
srcpkgs/ocaml/template | 6 +++---
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
index 333276741c7d..a26f6a639e18 100644
--- a/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
+++ b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
@@ -18,25 +18,25 @@
.globl caml_system__frametable
.type caml_system__frametable, @object
caml_system__frametable:
---- ocaml-4.11.0/configure.ac
-+++ ocaml-4.11.0/configure.ac
+--- ocaml-4.14.0/configure.ac
++++ ocaml-4.14.0/configure.ac
@@ -1006,7 +1006,7 @@ AS_IF([test $arch != "none" && $arch64 ],
# e.g. Ubuntu >= 17.10 for i386, which uses the glibc dynamic loader.
AS_CASE([$arch],
-- [amd64|s390x|none],
-+ [amd64|s390x|power|none],
+- [amd64|arm64|s390x|none],
++ [amd64|arm64|s390x|power|none],
# ocamlopt generates PIC code or doesn't generate code at all
[],
[AS_CASE([$host],
---- ocaml-4.11.0/configure
-+++ ocaml-4.11.0/configure
+--- ocaml-4.14.0/configure
++++ ocaml-4.14.0/configure
@@ -13886,7 +13886,7 @@
# e.g. Ubuntu >= 17.10 for i386, which uses the glibc dynamic loader.
case $arch in #(
-- amd64|s390x|none) :
-+ amd64|s390x|power|none) :
+- amd64|arm64|s390x|none) :
++ amd64|arm64|s390x|power|none) :
# ocamlopt generates PIC code or doesn't generate code at all
;; #(
*) :
diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template
index 629c13791dfe..10d7d5ddcd82 100644
--- a/srcpkgs/ocaml/template
+++ b/srcpkgs/ocaml/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml'
pkgname=ocaml
-version=4.13.1
-revision=2
+version=4.14
+revision=1
build_style="gnu-configure"
configure_args="--with-pic --libdir=/usr/lib/ocaml"
make_build_target="world.opt"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="QPL-1.0, LGPL-2.1-only"
homepage="http://ocaml.org/"
distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=194c7988cc1fd1c64f53f32f2f7551e5309e44d914d6efc7e2e4d002296aeac4
+checksum=8709ed83501979e23d65c93a1db66ae7cd3e2d56927bd95aaa0a2c837c2c50e4
nocross=yes
export ASPP="cc -c"
From 8cb5afdbbd9fe61b6d9db0aedac588509e4a28d0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:47:06 +0200
Subject: [PATCH 02/23] ocaml-findlib: update to 1.9.3.
---
srcpkgs/ocaml-findlib/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template
index 73cca5a2cafa..04be12e64f51 100644
--- a/srcpkgs/ocaml-findlib/template
+++ b/srcpkgs/ocaml-findlib/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml-findlib'
pkgname=ocaml-findlib
-version=1.9.1
-revision=3
+version=1.9.3
+revision=1
wrksrc="findlib-${version}"
build_style=configure
configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man"
@@ -12,7 +12,7 @@ maintainer="John Regan <john@jrjrtech.com>"
license="MIT"
homepage="http://projects.camlcity.org/projects/findlib.html"
distfiles="http://download.camlcity.org/download/findlib-${version}.tar.gz"
-checksum=2b42b8bd54488d64c4bf3cb7054b4b37bd30c1dc12bd431ea1e4d7ad8a980fe2
+checksum=c310fcb62838d9e50f0b6d6c5ceefcbe4fe056f72496950ae7d5c6cdaae2cc41
nocross=yes
nopie=yes
disable_parallel_build=yes
From e9ecdd9065b4365deb471d52f34fb10362969b3f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:48:00 +0200
Subject: [PATCH 03/23] ocaml-num: rebuild for ocaml-4.14_1.
---
srcpkgs/ocaml-num/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ocaml-num/template b/srcpkgs/ocaml-num/template
index bfce4e7baf91..739ffcf5d419 100644
--- a/srcpkgs/ocaml-num/template
+++ b/srcpkgs/ocaml-num/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml-num'
pkgname=ocaml-num
version=1.4
-revision=3
+revision=4
wrksrc="num-${version}"
build_style=gnu-makefile
make_install_target="findlib-install"
From 6f4157f4ff1958c5720009b0c10635047c3d0d45 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:49:19 +0200
Subject: [PATCH 04/23] ocaml-zarith: rebuild for ocaml-4.14_1.
---
srcpkgs/ocaml-zarith/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ocaml-zarith/template b/srcpkgs/ocaml-zarith/template
index d6c12772723d..936b5cd3f607 100644
--- a/srcpkgs/ocaml-zarith/template
+++ b/srcpkgs/ocaml-zarith/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml-zarith'
pkgname=ocaml-zarith
version=1.12
-revision=3
+revision=4
wrksrc="Zarith-release-${version}"
build_style=configure
make_check_target="tests"
From b0b8290764b6b437f7711456089e6f1057ec8699 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:50:43 +0200
Subject: [PATCH 05/23] ocamlbuild: rebuild for ocaml-4.14_1.
---
srcpkgs/ocamlbuild/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ocamlbuild/template b/srcpkgs/ocamlbuild/template
index 077d5cc7f632..b1349909f784 100644
--- a/srcpkgs/ocamlbuild/template
+++ b/srcpkgs/ocamlbuild/template
@@ -1,7 +1,7 @@
# Template file for 'ocamlbuild'
pkgname=ocamlbuild
version=0.14.1
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="PREFIX=/usr"
make_install_args="PREFIX=/usr"
@@ -13,3 +13,5 @@ homepage="https://github.com/ocaml/ocamlbuild"
distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
checksum=4e1279ff0ef80c862eaa5207a77020d741e89ef94f0e4a92a37c4188dbf08256
nocross=yes
+
+export CHECK_IF_PREINSTALLED=false
From 64576cc340a6fba592f9d064fccf37f2205f4bc5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:51:59 +0200
Subject: [PATCH 06/23] ocaml-stdcompat: update to 18.
---
srcpkgs/ocaml-stdcompat/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ocaml-stdcompat/template b/srcpkgs/ocaml-stdcompat/template
index 2035a9a2c4fa..65a0d6fbc78f 100644
--- a/srcpkgs/ocaml-stdcompat/template
+++ b/srcpkgs/ocaml-stdcompat/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml-stdcompat'
pkgname=ocaml-stdcompat
-version=16
-revision=2
+version=18
+revision=1
wrksrc="stdcompat-${version}"
build_style=gnu-configure
configure_args="--libdir=/usr/lib/ocaml"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-2-Clause"
homepage="https://github.com/thierry-martinez/stdcompat"
distfiles="https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz"
-checksum=100152e25f138351cb265146cd8717fa9dbfbff54b48ce771e30a4e05fc1ec09
+checksum=483a8d526eb19709a1a3092fb8978302e3a9d3bb783d807fb9ee53d96c3ec607
nocross=yes
disable_parallel_build=yes
From cf8de5eab1b6e32ef09a4dd86e4ee41423ba7051 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:53:13 +0200
Subject: [PATCH 07/23] hivex: rebuild for ocaml-4.14_1.
---
srcpkgs/hivex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 448c06ddc9fa..f6f12d1b70f3 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
# Template file for 'hivex'
pkgname=hivex
version=1.3.21
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--disable-ocaml" # currently ocaml is broken
hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
From 6d71e89a71d4c89725f46ed2ffad2a102972321f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:53:32 +0200
Subject: [PATCH 08/23] opam: rebuild for ocaml-4.14_1.
---
srcpkgs/opam/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index 236a2f963b70..ca5c64092ac8 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
# Template file for 'opam'
pkgname=opam
version=2.1.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--docdir=/usr/share/doc/${pkgname}"
make_build_args="lib-ext all"
From bf0a03e348a26e5a4519603e07b8761d99800c01 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:53:52 +0200
Subject: [PATCH 09/23] ocaml-lablgtk2: rebuild for ocaml-4.14_1.
---
srcpkgs/ocaml-lablgtk2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ocaml-lablgtk2/template b/srcpkgs/ocaml-lablgtk2/template
index c835e6b19d5d..6ff864eb1720 100644
--- a/srcpkgs/ocaml-lablgtk2/template
+++ b/srcpkgs/ocaml-lablgtk2/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml-lablgtk2'
pkgname=ocaml-lablgtk2
version=2.18.10
-revision=4
+revision=5
wrksrc="lablgtk-${version}"
build_style=gnu-configure
configure_args="--without-glade --without-gnomeui --without-gtksourceview"
From 441b0f9a8c95be2b5cec667cc87caa41429397ba Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:56:12 +0200
Subject: [PATCH 10/23] pdfsandwich: rebuild for ocaml-4.14_1.
---
srcpkgs/pdfsandwich/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pdfsandwich/template b/srcpkgs/pdfsandwich/template
index f3603e064c90..82f2f934fdc1 100644
--- a/srcpkgs/pdfsandwich/template
+++ b/srcpkgs/pdfsandwich/template
@@ -1,7 +1,7 @@
# Template file for 'pdfsandwich'
pkgname=pdfsandwich
version=0.1.7
-revision=5
+revision=6
build_style=gnu-configure
hostmakedepends="ocaml perl"
makedepends="ocaml"
From 18f12c1c0411154a95992fd5867fc6c67aa0f075 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:56:17 +0200
Subject: [PATCH 11/23] supermin: rebuild for ocaml-4.14_1.
---
srcpkgs/supermin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supermin/template b/srcpkgs/supermin/template
index 357fc3f255f8..5f80c3515b3d 100644
--- a/srcpkgs/supermin/template
+++ b/srcpkgs/supermin/template
@@ -1,7 +1,7 @@
# Template file for 'supermin'
pkgname=supermin
version=5.2.2
-revision=1
+revision=2
_release_series=5.2-stable
build_style=gnu-configure
hostmakedepends="ocaml ocaml-findlib pkg-config e2fsprogs cpio perl"
From 552f214344f144491dc4660ccdcbb0689e490427 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:56:24 +0200
Subject: [PATCH 12/23] z3: rebuild for ocaml-4.14_1.
---
srcpkgs/z3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index 2d5bf7a80954..dea059c98d0c 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,7 +1,7 @@
# Template file for 'z3'
pkgname=z3
version=4.8.15
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=configure
configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"
From e348b2c114ecb8615c5fd80d8fd8b1cad080d5e5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:58:01 +0200
Subject: [PATCH 13/23] zeroinstall: rebuild for ocaml-4.14_1.
---
srcpkgs/zeroinstall/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index eb8e1ea24280..40d8740b1300 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -1,7 +1,7 @@
# Template file for 'zeroinstall'
pkgname=zeroinstall
version=2.17
-revision=5
+revision=6
wrksrc="0install-v${version}"
build_style=gnu-makefile
make_install_target="install_system"
From d0ffad8a8a22fce6802c89dc37f634952ab1657c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:01:53 +0200
Subject: [PATCH 14/23] coccinelle: rebuild for ocaml-4.14_1.
---
srcpkgs/coccinelle/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/coccinelle/template b/srcpkgs/coccinelle/template
index 211c9bdb4394..709b45fd2f69 100644
--- a/srcpkgs/coccinelle/template
+++ b/srcpkgs/coccinelle/template
@@ -1,7 +1,7 @@
# Template file for 'coccinelle'
pkgname=coccinelle
version=1.1.0
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-pdflatex --enable-release --enable-opt
--with-python=/usr/bin/python3"
From 05bf48bc7cfbd69a29df3898cb052130a6d2ac15 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:03:56 +0200
Subject: [PATCH 15/23] libguestfs: rebuild for ocaml-4.14_1.
---
srcpkgs/libguestfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 8d669017077e..c6c56f8142b7 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,7 +1,7 @@
# Template file for 'libguestfs'
pkgname=libguestfs
version=1.48.0
-revision=1
+revision=2
_version_short=${version%.*}
build_style=gnu-configure
make_install_args="INSTALLDIRS=vendor"
From f0ba0bb041b4fc05260a6ec180e39b170b20f0e9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:04:56 +0200
Subject: [PATCH 16/23] unison: rebuild for ocaml-4.14_1.
---
srcpkgs/unison/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template
index 783573c120ea..97eb209e2e8c 100644
--- a/srcpkgs/unison/template
+++ b/srcpkgs/unison/template
@@ -1,7 +1,7 @@
# Template file for 'unison'
pkgname=unison
version=2.52.0
-revision=1
+revision=2
hostmakedepends="ocaml"
short_desc="File-synchronization tool"
maintainer="allan <mail@may.mooo.com>"
From 45320174044e7f3559953fb3583b810fafcd15c1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:08:13 +0200
Subject: [PATCH 17/23] xen: rebuild for ocaml-4.14_1.
---
srcpkgs/xen/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index deb572fe8b9c..10b8684c9711 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -1,7 +1,7 @@
# Template file for 'xen'
pkgname=xen
version=4.14.1
-revision=5
+revision=6
# grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot
_git_tag_ipxe=4bd064de239dab2426b31c9789a1f4d78087dc63
# TODO: arm / aarch64
From 585def61dd55e4f1e0361af0f12356bf2f1c9ac8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:08:51 +0200
Subject: [PATCH 18/23] camlp5: rebuild for ocaml-4.14_1.
---
srcpkgs/camlp5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template
index 2d07ecc842b4..74e0809e16d1 100644
--- a/srcpkgs/camlp5/template
+++ b/srcpkgs/camlp5/template
@@ -1,7 +1,7 @@
# Template file for 'camlp5'
pkgname=camlp5
version=8.00.03
-revision=1
+revision=2
wrksrc="camlp5-rel${version}"
build_style=configure
configure_args="-mandir /usr/share/man"
From 1ea97c12cda0e255889a91f16aea6cc64b3aa43e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:12:31 +0200
Subject: [PATCH 19/23] dune: rebuild for ocaml-4.14_1.
---
srcpkgs/dune/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dune/template b/srcpkgs/dune/template
index 178746cfc292..30c34cb44c00 100644
--- a/srcpkgs/dune/template
+++ b/srcpkgs/dune/template
@@ -1,7 +1,7 @@
# Template file for 'dune'
pkgname=dune
version=3.0.3
-revision=1
+revision=2
makedepends="ocaml"
depends="ocaml"
short_desc="Composable build system for OCaml"
From 89b74d1c6ede82128ffdcf911fa3f8562c1e1130 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:18:07 +0200
Subject: [PATCH 20/23] New package: ocaml-camlp-streams-5.0
---
srcpkgs/ocaml-camlp-streams/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/ocaml-camlp-streams/template
diff --git a/srcpkgs/ocaml-camlp-streams/template b/srcpkgs/ocaml-camlp-streams/template
new file mode 100644
index 000000000000..ce728427d280
--- /dev/null
+++ b/srcpkgs/ocaml-camlp-streams/template
@@ -0,0 +1,22 @@
+# Template file for 'ocaml-camlp-streams'
+pkgname=ocaml-camlp-streams
+version=5.0
+revision=1
+wrksrc="camlp-streams-${version}"
+makedepends="ocaml dune"
+short_desc="Stream and Genlex libraries for use with Camlp4 and Camlp5"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="LGPL-2.1-only,OCaml-LGPL-linking-exception"
+homepage="https://github.com/ocaml/camlp-streams"
+distfiles="https://github.com/ocaml/camlp-streams/archive/v${version}.tar.gz"
+checksum=daa618bb57a876075a1801d9dcde7dee83635766185f565af913dff43ea4d226
+nocross=yes
+disable_parallel_build=yes
+
+do_build() {
+ dune build --display=short
+}
+do_install() {
+ dune install --prefix=/usr --destdir="$DESTDIR" \
+ --libdir=/usr/lib/ocaml --docdir=/usr/share/doc
+}
From 51c59a17b144eea86552149b01d533c106f6ec2f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:23:36 +0200
Subject: [PATCH 21/23] camlp5: rebuild for ocaml-4.14_1.
---
srcpkgs/camlp5/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template
index 74e0809e16d1..1118f618ba1f 100644
--- a/srcpkgs/camlp5/template
+++ b/srcpkgs/camlp5/template
@@ -1,11 +1,12 @@
# Template file for 'camlp5'
pkgname=camlp5
version=8.00.03
-revision=2
+revision=3
wrksrc="camlp5-rel${version}"
build_style=configure
configure_args="-mandir /usr/share/man"
hostmakedepends="ocaml perl ocaml-findlib"
+makedepends="ocaml-camlp-streams"
short_desc="OCaml preprocessor and pretty-printer"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
From dea5c12f77e4e304e5a0639dc9089a1e241edcbe Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:23:46 +0200
Subject: [PATCH 22/23] coq: rebuild for ocaml-4.14_1.
---
srcpkgs/coq/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index fcfbc92cb2f6..5db6a99c5e5e 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,7 +1,7 @@
# Template file for 'coq'
pkgname=coq
version=8.15.1
-revision=1
+revision=2
hostmakedepends="camlp5 dune ocaml ocaml-findlib ocaml-num ocaml-zarith"
short_desc="Proof assistant written in OCaml"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From b9211360dc8068e4cf9c6a6e79a0d439978c2ba6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:30:50 +0200
Subject: [PATCH 23/23] mathcomp: rebuild for coq-8.15.1_2.
---
srcpkgs/mathcomp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index 5946de08e18b..9bdea51dcf48 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -1,7 +1,7 @@
# Template file for 'mathcomp'
pkgname=mathcomp
version=1.14.0
-revision=1
+revision=2
wrksrc="math-comp-mathcomp-${version}"
build_wrksrc="mathcomp"
build_style=gnu-makefile
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] OCaml 4.14
2022-04-13 19:39 [PR PATCH] Ocaml414 leahneukirchen
2022-04-13 19:40 ` [PR PATCH] [Updated] OCaml 4.14 leahneukirchen
@ 2022-04-13 19:41 ` leahneukirchen
2022-04-13 20:07 ` leahneukirchen
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: leahneukirchen @ 2022-04-13 19:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 582 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages ocaml414
https://github.com/void-linux/void-packages/pull/36683
OCaml 4.14
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
TBD:
- [ ] zeroinstall: opam doesn't work with 4.14 yet?
- [ ] xen: FTBFS due to as86 missing, unrelated?
A patch file from https://github.com/void-linux/void-packages/pull/36683.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ocaml414-36683.patch --]
[-- Type: text/x-diff, Size: 18193 bytes --]
From fe0a1d91c4bd689aca333068663c2936ab56c335 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:45:24 +0200
Subject: [PATCH 01/21] ocaml: update to 4.14.
---
srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch | 16 ++++++++--------
srcpkgs/ocaml/template | 6 +++---
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
index 333276741c7d..a26f6a639e18 100644
--- a/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
+++ b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
@@ -18,25 +18,25 @@
.globl caml_system__frametable
.type caml_system__frametable, @object
caml_system__frametable:
---- ocaml-4.11.0/configure.ac
-+++ ocaml-4.11.0/configure.ac
+--- ocaml-4.14.0/configure.ac
++++ ocaml-4.14.0/configure.ac
@@ -1006,7 +1006,7 @@ AS_IF([test $arch != "none" && $arch64 ],
# e.g. Ubuntu >= 17.10 for i386, which uses the glibc dynamic loader.
AS_CASE([$arch],
-- [amd64|s390x|none],
-+ [amd64|s390x|power|none],
+- [amd64|arm64|s390x|none],
++ [amd64|arm64|s390x|power|none],
# ocamlopt generates PIC code or doesn't generate code at all
[],
[AS_CASE([$host],
---- ocaml-4.11.0/configure
-+++ ocaml-4.11.0/configure
+--- ocaml-4.14.0/configure
++++ ocaml-4.14.0/configure
@@ -13886,7 +13886,7 @@
# e.g. Ubuntu >= 17.10 for i386, which uses the glibc dynamic loader.
case $arch in #(
-- amd64|s390x|none) :
-+ amd64|s390x|power|none) :
+- amd64|arm64|s390x|none) :
++ amd64|arm64|s390x|power|none) :
# ocamlopt generates PIC code or doesn't generate code at all
;; #(
*) :
diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template
index 629c13791dfe..10d7d5ddcd82 100644
--- a/srcpkgs/ocaml/template
+++ b/srcpkgs/ocaml/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml'
pkgname=ocaml
-version=4.13.1
-revision=2
+version=4.14
+revision=1
build_style="gnu-configure"
configure_args="--with-pic --libdir=/usr/lib/ocaml"
make_build_target="world.opt"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="QPL-1.0, LGPL-2.1-only"
homepage="http://ocaml.org/"
distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=194c7988cc1fd1c64f53f32f2f7551e5309e44d914d6efc7e2e4d002296aeac4
+checksum=8709ed83501979e23d65c93a1db66ae7cd3e2d56927bd95aaa0a2c837c2c50e4
nocross=yes
export ASPP="cc -c"
From 8cb5afdbbd9fe61b6d9db0aedac588509e4a28d0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:47:06 +0200
Subject: [PATCH 02/21] ocaml-findlib: update to 1.9.3.
---
srcpkgs/ocaml-findlib/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template
index 73cca5a2cafa..04be12e64f51 100644
--- a/srcpkgs/ocaml-findlib/template
+++ b/srcpkgs/ocaml-findlib/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml-findlib'
pkgname=ocaml-findlib
-version=1.9.1
-revision=3
+version=1.9.3
+revision=1
wrksrc="findlib-${version}"
build_style=configure
configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man"
@@ -12,7 +12,7 @@ maintainer="John Regan <john@jrjrtech.com>"
license="MIT"
homepage="http://projects.camlcity.org/projects/findlib.html"
distfiles="http://download.camlcity.org/download/findlib-${version}.tar.gz"
-checksum=2b42b8bd54488d64c4bf3cb7054b4b37bd30c1dc12bd431ea1e4d7ad8a980fe2
+checksum=c310fcb62838d9e50f0b6d6c5ceefcbe4fe056f72496950ae7d5c6cdaae2cc41
nocross=yes
nopie=yes
disable_parallel_build=yes
From e9ecdd9065b4365deb471d52f34fb10362969b3f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:48:00 +0200
Subject: [PATCH 03/21] ocaml-num: rebuild for ocaml-4.14_1.
---
srcpkgs/ocaml-num/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ocaml-num/template b/srcpkgs/ocaml-num/template
index bfce4e7baf91..739ffcf5d419 100644
--- a/srcpkgs/ocaml-num/template
+++ b/srcpkgs/ocaml-num/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml-num'
pkgname=ocaml-num
version=1.4
-revision=3
+revision=4
wrksrc="num-${version}"
build_style=gnu-makefile
make_install_target="findlib-install"
From 6f4157f4ff1958c5720009b0c10635047c3d0d45 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:49:19 +0200
Subject: [PATCH 04/21] ocaml-zarith: rebuild for ocaml-4.14_1.
---
srcpkgs/ocaml-zarith/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ocaml-zarith/template b/srcpkgs/ocaml-zarith/template
index d6c12772723d..936b5cd3f607 100644
--- a/srcpkgs/ocaml-zarith/template
+++ b/srcpkgs/ocaml-zarith/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml-zarith'
pkgname=ocaml-zarith
version=1.12
-revision=3
+revision=4
wrksrc="Zarith-release-${version}"
build_style=configure
make_check_target="tests"
From b0b8290764b6b437f7711456089e6f1057ec8699 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:50:43 +0200
Subject: [PATCH 05/21] ocamlbuild: rebuild for ocaml-4.14_1.
---
srcpkgs/ocamlbuild/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ocamlbuild/template b/srcpkgs/ocamlbuild/template
index 077d5cc7f632..b1349909f784 100644
--- a/srcpkgs/ocamlbuild/template
+++ b/srcpkgs/ocamlbuild/template
@@ -1,7 +1,7 @@
# Template file for 'ocamlbuild'
pkgname=ocamlbuild
version=0.14.1
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="PREFIX=/usr"
make_install_args="PREFIX=/usr"
@@ -13,3 +13,5 @@ homepage="https://github.com/ocaml/ocamlbuild"
distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
checksum=4e1279ff0ef80c862eaa5207a77020d741e89ef94f0e4a92a37c4188dbf08256
nocross=yes
+
+export CHECK_IF_PREINSTALLED=false
From 64576cc340a6fba592f9d064fccf37f2205f4bc5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:51:59 +0200
Subject: [PATCH 06/21] ocaml-stdcompat: update to 18.
---
srcpkgs/ocaml-stdcompat/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ocaml-stdcompat/template b/srcpkgs/ocaml-stdcompat/template
index 2035a9a2c4fa..65a0d6fbc78f 100644
--- a/srcpkgs/ocaml-stdcompat/template
+++ b/srcpkgs/ocaml-stdcompat/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml-stdcompat'
pkgname=ocaml-stdcompat
-version=16
-revision=2
+version=18
+revision=1
wrksrc="stdcompat-${version}"
build_style=gnu-configure
configure_args="--libdir=/usr/lib/ocaml"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-2-Clause"
homepage="https://github.com/thierry-martinez/stdcompat"
distfiles="https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz"
-checksum=100152e25f138351cb265146cd8717fa9dbfbff54b48ce771e30a4e05fc1ec09
+checksum=483a8d526eb19709a1a3092fb8978302e3a9d3bb783d807fb9ee53d96c3ec607
nocross=yes
disable_parallel_build=yes
From cf8de5eab1b6e32ef09a4dd86e4ee41423ba7051 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:53:13 +0200
Subject: [PATCH 07/21] hivex: rebuild for ocaml-4.14_1.
---
srcpkgs/hivex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 448c06ddc9fa..f6f12d1b70f3 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
# Template file for 'hivex'
pkgname=hivex
version=1.3.21
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--disable-ocaml" # currently ocaml is broken
hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
From 6d71e89a71d4c89725f46ed2ffad2a102972321f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:53:32 +0200
Subject: [PATCH 08/21] opam: rebuild for ocaml-4.14_1.
---
srcpkgs/opam/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index 236a2f963b70..ca5c64092ac8 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
# Template file for 'opam'
pkgname=opam
version=2.1.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--docdir=/usr/share/doc/${pkgname}"
make_build_args="lib-ext all"
From bf0a03e348a26e5a4519603e07b8761d99800c01 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:53:52 +0200
Subject: [PATCH 09/21] ocaml-lablgtk2: rebuild for ocaml-4.14_1.
---
srcpkgs/ocaml-lablgtk2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ocaml-lablgtk2/template b/srcpkgs/ocaml-lablgtk2/template
index c835e6b19d5d..6ff864eb1720 100644
--- a/srcpkgs/ocaml-lablgtk2/template
+++ b/srcpkgs/ocaml-lablgtk2/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml-lablgtk2'
pkgname=ocaml-lablgtk2
version=2.18.10
-revision=4
+revision=5
wrksrc="lablgtk-${version}"
build_style=gnu-configure
configure_args="--without-glade --without-gnomeui --without-gtksourceview"
From 441b0f9a8c95be2b5cec667cc87caa41429397ba Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:56:12 +0200
Subject: [PATCH 10/21] pdfsandwich: rebuild for ocaml-4.14_1.
---
srcpkgs/pdfsandwich/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pdfsandwich/template b/srcpkgs/pdfsandwich/template
index f3603e064c90..82f2f934fdc1 100644
--- a/srcpkgs/pdfsandwich/template
+++ b/srcpkgs/pdfsandwich/template
@@ -1,7 +1,7 @@
# Template file for 'pdfsandwich'
pkgname=pdfsandwich
version=0.1.7
-revision=5
+revision=6
build_style=gnu-configure
hostmakedepends="ocaml perl"
makedepends="ocaml"
From 18f12c1c0411154a95992fd5867fc6c67aa0f075 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:56:17 +0200
Subject: [PATCH 11/21] supermin: rebuild for ocaml-4.14_1.
---
srcpkgs/supermin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supermin/template b/srcpkgs/supermin/template
index 357fc3f255f8..5f80c3515b3d 100644
--- a/srcpkgs/supermin/template
+++ b/srcpkgs/supermin/template
@@ -1,7 +1,7 @@
# Template file for 'supermin'
pkgname=supermin
version=5.2.2
-revision=1
+revision=2
_release_series=5.2-stable
build_style=gnu-configure
hostmakedepends="ocaml ocaml-findlib pkg-config e2fsprogs cpio perl"
From 552f214344f144491dc4660ccdcbb0689e490427 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:56:24 +0200
Subject: [PATCH 12/21] z3: rebuild for ocaml-4.14_1.
---
srcpkgs/z3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index 2d5bf7a80954..dea059c98d0c 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,7 +1,7 @@
# Template file for 'z3'
pkgname=z3
version=4.8.15
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=configure
configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"
From 917aea8e81cff3ddb56c48deb835b432b9fcea7c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:01:53 +0200
Subject: [PATCH 13/21] coccinelle: rebuild for ocaml-4.14_1.
---
srcpkgs/coccinelle/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/coccinelle/template b/srcpkgs/coccinelle/template
index 211c9bdb4394..709b45fd2f69 100644
--- a/srcpkgs/coccinelle/template
+++ b/srcpkgs/coccinelle/template
@@ -1,7 +1,7 @@
# Template file for 'coccinelle'
pkgname=coccinelle
version=1.1.0
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-pdflatex --enable-release --enable-opt
--with-python=/usr/bin/python3"
From cf9a0063de242bf9b2b0f467b4e600fab06e37b1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:03:56 +0200
Subject: [PATCH 14/21] libguestfs: rebuild for ocaml-4.14_1.
---
srcpkgs/libguestfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 8d669017077e..c6c56f8142b7 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,7 +1,7 @@
# Template file for 'libguestfs'
pkgname=libguestfs
version=1.48.0
-revision=1
+revision=2
_version_short=${version%.*}
build_style=gnu-configure
make_install_args="INSTALLDIRS=vendor"
From f4afb9707b8d694b2b5bf28d100394a90fa0b9d9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:04:56 +0200
Subject: [PATCH 15/21] unison: rebuild for ocaml-4.14_1.
---
srcpkgs/unison/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template
index 783573c120ea..97eb209e2e8c 100644
--- a/srcpkgs/unison/template
+++ b/srcpkgs/unison/template
@@ -1,7 +1,7 @@
# Template file for 'unison'
pkgname=unison
version=2.52.0
-revision=1
+revision=2
hostmakedepends="ocaml"
short_desc="File-synchronization tool"
maintainer="allan <mail@may.mooo.com>"
From d890caf3ddc05dd047430bd8da95a385b4fdb42d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:08:51 +0200
Subject: [PATCH 16/21] camlp5: rebuild for ocaml-4.14_1.
---
srcpkgs/camlp5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template
index 2d07ecc842b4..74e0809e16d1 100644
--- a/srcpkgs/camlp5/template
+++ b/srcpkgs/camlp5/template
@@ -1,7 +1,7 @@
# Template file for 'camlp5'
pkgname=camlp5
version=8.00.03
-revision=1
+revision=2
wrksrc="camlp5-rel${version}"
build_style=configure
configure_args="-mandir /usr/share/man"
From d885d56b2d54340af8420487c097b148d1c37e5d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:12:31 +0200
Subject: [PATCH 17/21] dune: rebuild for ocaml-4.14_1.
---
srcpkgs/dune/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dune/template b/srcpkgs/dune/template
index 178746cfc292..30c34cb44c00 100644
--- a/srcpkgs/dune/template
+++ b/srcpkgs/dune/template
@@ -1,7 +1,7 @@
# Template file for 'dune'
pkgname=dune
version=3.0.3
-revision=1
+revision=2
makedepends="ocaml"
depends="ocaml"
short_desc="Composable build system for OCaml"
From ee192344ffa7f48d91968542edd39957fe1b0262 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:18:07 +0200
Subject: [PATCH 18/21] New package: ocaml-camlp-streams-5.0
---
srcpkgs/ocaml-camlp-streams/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/ocaml-camlp-streams/template
diff --git a/srcpkgs/ocaml-camlp-streams/template b/srcpkgs/ocaml-camlp-streams/template
new file mode 100644
index 000000000000..ce728427d280
--- /dev/null
+++ b/srcpkgs/ocaml-camlp-streams/template
@@ -0,0 +1,22 @@
+# Template file for 'ocaml-camlp-streams'
+pkgname=ocaml-camlp-streams
+version=5.0
+revision=1
+wrksrc="camlp-streams-${version}"
+makedepends="ocaml dune"
+short_desc="Stream and Genlex libraries for use with Camlp4 and Camlp5"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="LGPL-2.1-only,OCaml-LGPL-linking-exception"
+homepage="https://github.com/ocaml/camlp-streams"
+distfiles="https://github.com/ocaml/camlp-streams/archive/v${version}.tar.gz"
+checksum=daa618bb57a876075a1801d9dcde7dee83635766185f565af913dff43ea4d226
+nocross=yes
+disable_parallel_build=yes
+
+do_build() {
+ dune build --display=short
+}
+do_install() {
+ dune install --prefix=/usr --destdir="$DESTDIR" \
+ --libdir=/usr/lib/ocaml --docdir=/usr/share/doc
+}
From e62dbc31c36a7030b256f77495d408dffaa214a6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:23:36 +0200
Subject: [PATCH 19/21] camlp5: rebuild for ocaml-4.14_1.
---
srcpkgs/camlp5/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template
index 74e0809e16d1..1118f618ba1f 100644
--- a/srcpkgs/camlp5/template
+++ b/srcpkgs/camlp5/template
@@ -1,11 +1,12 @@
# Template file for 'camlp5'
pkgname=camlp5
version=8.00.03
-revision=2
+revision=3
wrksrc="camlp5-rel${version}"
build_style=configure
configure_args="-mandir /usr/share/man"
hostmakedepends="ocaml perl ocaml-findlib"
+makedepends="ocaml-camlp-streams"
short_desc="OCaml preprocessor and pretty-printer"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
From acee9c7f2245ee3926d4792e087d83443b6ac3a9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:23:46 +0200
Subject: [PATCH 20/21] coq: rebuild for ocaml-4.14_1.
---
srcpkgs/coq/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index fcfbc92cb2f6..5db6a99c5e5e 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,7 +1,7 @@
# Template file for 'coq'
pkgname=coq
version=8.15.1
-revision=1
+revision=2
hostmakedepends="camlp5 dune ocaml ocaml-findlib ocaml-num ocaml-zarith"
short_desc="Proof assistant written in OCaml"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From 1cf5d206df4ca95fd41fae099b70a7aecbf2623b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:30:50 +0200
Subject: [PATCH 21/21] mathcomp: rebuild for coq-8.15.1_2.
---
srcpkgs/mathcomp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index 5946de08e18b..9bdea51dcf48 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -1,7 +1,7 @@
# Template file for 'mathcomp'
pkgname=mathcomp
version=1.14.0
-revision=1
+revision=2
wrksrc="math-comp-mathcomp-${version}"
build_wrksrc="mathcomp"
build_style=gnu-makefile
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] OCaml 4.14
2022-04-13 19:39 [PR PATCH] Ocaml414 leahneukirchen
2022-04-13 19:40 ` [PR PATCH] [Updated] OCaml 4.14 leahneukirchen
2022-04-13 19:41 ` leahneukirchen
@ 2022-04-13 20:07 ` leahneukirchen
2022-04-14 12:27 ` leahneukirchen
2022-04-14 14:16 ` [PR PATCH] [Merged]: " leahneukirchen
4 siblings, 0 replies; 6+ messages in thread
From: leahneukirchen @ 2022-04-13 20:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 582 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages ocaml414
https://github.com/void-linux/void-packages/pull/36683
OCaml 4.14
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
TBD:
- [ ] zeroinstall: opam doesn't work with 4.14 yet?
- [ ] xen: FTBFS due to as86 missing, unrelated?
A patch file from https://github.com/void-linux/void-packages/pull/36683.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ocaml414-36683.patch --]
[-- Type: text/x-diff, Size: 20358 bytes --]
From c776d058f93bbdeabe0001b799d7d7f1b19ebcb9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:45:24 +0200
Subject: [PATCH 01/23] ocaml: update to 4.14.0.
---
srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch | 16 ++++++++--------
srcpkgs/ocaml/template | 6 +++---
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
index 333276741c7d..a26f6a639e18 100644
--- a/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
+++ b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
@@ -18,25 +18,25 @@
.globl caml_system__frametable
.type caml_system__frametable, @object
caml_system__frametable:
---- ocaml-4.11.0/configure.ac
-+++ ocaml-4.11.0/configure.ac
+--- ocaml-4.14.0/configure.ac
++++ ocaml-4.14.0/configure.ac
@@ -1006,7 +1006,7 @@ AS_IF([test $arch != "none" && $arch64 ],
# e.g. Ubuntu >= 17.10 for i386, which uses the glibc dynamic loader.
AS_CASE([$arch],
-- [amd64|s390x|none],
-+ [amd64|s390x|power|none],
+- [amd64|arm64|s390x|none],
++ [amd64|arm64|s390x|power|none],
# ocamlopt generates PIC code or doesn't generate code at all
[],
[AS_CASE([$host],
---- ocaml-4.11.0/configure
-+++ ocaml-4.11.0/configure
+--- ocaml-4.14.0/configure
++++ ocaml-4.14.0/configure
@@ -13886,7 +13886,7 @@
# e.g. Ubuntu >= 17.10 for i386, which uses the glibc dynamic loader.
case $arch in #(
-- amd64|s390x|none) :
-+ amd64|s390x|power|none) :
+- amd64|arm64|s390x|none) :
++ amd64|arm64|s390x|power|none) :
# ocamlopt generates PIC code or doesn't generate code at all
;; #(
*) :
diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template
index 629c13791dfe..7de25d70b827 100644
--- a/srcpkgs/ocaml/template
+++ b/srcpkgs/ocaml/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml'
pkgname=ocaml
-version=4.13.1
-revision=2
+version=4.14.0
+revision=1
build_style="gnu-configure"
configure_args="--with-pic --libdir=/usr/lib/ocaml"
make_build_target="world.opt"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="QPL-1.0, LGPL-2.1-only"
homepage="http://ocaml.org/"
distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=194c7988cc1fd1c64f53f32f2f7551e5309e44d914d6efc7e2e4d002296aeac4
+checksum=39f44260382f28d1054c5f9d8bf4753cb7ad64027da792f7938344544da155e8
nocross=yes
export ASPP="cc -c"
From 50651ee363a475ef8b0d314b04442a3567a7736f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:47:06 +0200
Subject: [PATCH 02/23] ocaml-findlib: update to 1.9.3.
---
srcpkgs/ocaml-findlib/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template
index 73cca5a2cafa..04be12e64f51 100644
--- a/srcpkgs/ocaml-findlib/template
+++ b/srcpkgs/ocaml-findlib/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml-findlib'
pkgname=ocaml-findlib
-version=1.9.1
-revision=3
+version=1.9.3
+revision=1
wrksrc="findlib-${version}"
build_style=configure
configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man"
@@ -12,7 +12,7 @@ maintainer="John Regan <john@jrjrtech.com>"
license="MIT"
homepage="http://projects.camlcity.org/projects/findlib.html"
distfiles="http://download.camlcity.org/download/findlib-${version}.tar.gz"
-checksum=2b42b8bd54488d64c4bf3cb7054b4b37bd30c1dc12bd431ea1e4d7ad8a980fe2
+checksum=c310fcb62838d9e50f0b6d6c5ceefcbe4fe056f72496950ae7d5c6cdaae2cc41
nocross=yes
nopie=yes
disable_parallel_build=yes
From 555099872a0034df6bb6031ef31fc9586a3fb991 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:48:00 +0200
Subject: [PATCH 03/23] ocaml-num: rebuild for ocaml-4.14.0_1.
---
srcpkgs/ocaml-num/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ocaml-num/template b/srcpkgs/ocaml-num/template
index bfce4e7baf91..739ffcf5d419 100644
--- a/srcpkgs/ocaml-num/template
+++ b/srcpkgs/ocaml-num/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml-num'
pkgname=ocaml-num
version=1.4
-revision=3
+revision=4
wrksrc="num-${version}"
build_style=gnu-makefile
make_install_target="findlib-install"
From 796d42e07591a16727c79d1d1e87324982a53b7c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:49:19 +0200
Subject: [PATCH 04/23] ocaml-zarith: rebuild for ocaml-4.14.0_1.
---
srcpkgs/ocaml-zarith/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ocaml-zarith/template b/srcpkgs/ocaml-zarith/template
index d6c12772723d..936b5cd3f607 100644
--- a/srcpkgs/ocaml-zarith/template
+++ b/srcpkgs/ocaml-zarith/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml-zarith'
pkgname=ocaml-zarith
version=1.12
-revision=3
+revision=4
wrksrc="Zarith-release-${version}"
build_style=configure
make_check_target="tests"
From 7d7b0e06e1c0ef47b7e9be88306ef8484810dd6e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:50:43 +0200
Subject: [PATCH 05/23] ocamlbuild: rebuild for ocaml-4.14.0_1.
---
srcpkgs/ocamlbuild/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ocamlbuild/template b/srcpkgs/ocamlbuild/template
index 077d5cc7f632..b1349909f784 100644
--- a/srcpkgs/ocamlbuild/template
+++ b/srcpkgs/ocamlbuild/template
@@ -1,7 +1,7 @@
# Template file for 'ocamlbuild'
pkgname=ocamlbuild
version=0.14.1
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="PREFIX=/usr"
make_install_args="PREFIX=/usr"
@@ -13,3 +13,5 @@ homepage="https://github.com/ocaml/ocamlbuild"
distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
checksum=4e1279ff0ef80c862eaa5207a77020d741e89ef94f0e4a92a37c4188dbf08256
nocross=yes
+
+export CHECK_IF_PREINSTALLED=false
From 43a04c7bf3c9df4d54d60530d7eba4100f6364e0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:51:59 +0200
Subject: [PATCH 06/23] ocaml-stdcompat: update to 18.
---
srcpkgs/ocaml-stdcompat/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ocaml-stdcompat/template b/srcpkgs/ocaml-stdcompat/template
index 2035a9a2c4fa..65a0d6fbc78f 100644
--- a/srcpkgs/ocaml-stdcompat/template
+++ b/srcpkgs/ocaml-stdcompat/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml-stdcompat'
pkgname=ocaml-stdcompat
-version=16
-revision=2
+version=18
+revision=1
wrksrc="stdcompat-${version}"
build_style=gnu-configure
configure_args="--libdir=/usr/lib/ocaml"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-2-Clause"
homepage="https://github.com/thierry-martinez/stdcompat"
distfiles="https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz"
-checksum=100152e25f138351cb265146cd8717fa9dbfbff54b48ce771e30a4e05fc1ec09
+checksum=483a8d526eb19709a1a3092fb8978302e3a9d3bb783d807fb9ee53d96c3ec607
nocross=yes
disable_parallel_build=yes
From a173f2be384726a2a73457d65f3ca7742169b980 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:53:13 +0200
Subject: [PATCH 07/23] hivex: rebuild for ocaml-4.14.0_1.
---
srcpkgs/hivex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 448c06ddc9fa..f6f12d1b70f3 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
# Template file for 'hivex'
pkgname=hivex
version=1.3.21
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--disable-ocaml" # currently ocaml is broken
hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
From 8a41a2cd118ffea0e5fdbd70e8944938389918b7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:53:32 +0200
Subject: [PATCH 08/23] opam: rebuild for ocaml-4.14.0_1.
---
srcpkgs/opam/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index 236a2f963b70..ca5c64092ac8 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
# Template file for 'opam'
pkgname=opam
version=2.1.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--docdir=/usr/share/doc/${pkgname}"
make_build_args="lib-ext all"
From f4d594600d4b0cb0dda76a4ae24dc2beb9d26a63 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:53:52 +0200
Subject: [PATCH 09/23] ocaml-lablgtk2: rebuild for ocaml-4.14.0_1.
---
srcpkgs/ocaml-lablgtk2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ocaml-lablgtk2/template b/srcpkgs/ocaml-lablgtk2/template
index c835e6b19d5d..6ff864eb1720 100644
--- a/srcpkgs/ocaml-lablgtk2/template
+++ b/srcpkgs/ocaml-lablgtk2/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml-lablgtk2'
pkgname=ocaml-lablgtk2
version=2.18.10
-revision=4
+revision=5
wrksrc="lablgtk-${version}"
build_style=gnu-configure
configure_args="--without-glade --without-gnomeui --without-gtksourceview"
From cdc3868e211c8b3368e39c7a6a5c42db5269793a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:56:12 +0200
Subject: [PATCH 10/23] pdfsandwich: rebuild for ocaml-4.14.0_1.
---
srcpkgs/pdfsandwich/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pdfsandwich/template b/srcpkgs/pdfsandwich/template
index f3603e064c90..82f2f934fdc1 100644
--- a/srcpkgs/pdfsandwich/template
+++ b/srcpkgs/pdfsandwich/template
@@ -1,7 +1,7 @@
# Template file for 'pdfsandwich'
pkgname=pdfsandwich
version=0.1.7
-revision=5
+revision=6
build_style=gnu-configure
hostmakedepends="ocaml perl"
makedepends="ocaml"
From 319e5bf0e982423b650d3b7a832af150589a69e2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:56:17 +0200
Subject: [PATCH 11/23] supermin: rebuild for ocaml-4.14.0_1.
---
srcpkgs/supermin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supermin/template b/srcpkgs/supermin/template
index 357fc3f255f8..5f80c3515b3d 100644
--- a/srcpkgs/supermin/template
+++ b/srcpkgs/supermin/template
@@ -1,7 +1,7 @@
# Template file for 'supermin'
pkgname=supermin
version=5.2.2
-revision=1
+revision=2
_release_series=5.2-stable
build_style=gnu-configure
hostmakedepends="ocaml ocaml-findlib pkg-config e2fsprogs cpio perl"
From cabfb04d740193a68b1ce4e831186607b35ccf91 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:56:24 +0200
Subject: [PATCH 12/23] z3: rebuild for ocaml-4.14.0_1.
---
srcpkgs/z3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index 2d5bf7a80954..dea059c98d0c 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,7 +1,7 @@
# Template file for 'z3'
pkgname=z3
version=4.8.15
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=configure
configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"
From 47b70a818512bf884e3bdb1dd9f88663edf14f88 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:01:53 +0200
Subject: [PATCH 13/23] coccinelle: rebuild for ocaml-4.14.0_1.
---
srcpkgs/coccinelle/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/coccinelle/template b/srcpkgs/coccinelle/template
index 211c9bdb4394..709b45fd2f69 100644
--- a/srcpkgs/coccinelle/template
+++ b/srcpkgs/coccinelle/template
@@ -1,7 +1,7 @@
# Template file for 'coccinelle'
pkgname=coccinelle
version=1.1.0
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-pdflatex --enable-release --enable-opt
--with-python=/usr/bin/python3"
From 94de0ae815c6551c27470f6c238fdabcb3c20f99 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:03:56 +0200
Subject: [PATCH 14/23] libguestfs: rebuild for ocaml-4.14.0_1.
---
srcpkgs/libguestfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 8d669017077e..c6c56f8142b7 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,7 +1,7 @@
# Template file for 'libguestfs'
pkgname=libguestfs
version=1.48.0
-revision=1
+revision=2
_version_short=${version%.*}
build_style=gnu-configure
make_install_args="INSTALLDIRS=vendor"
From 446934be83cde2aa07d8e2e4f88f7085382d02b6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:04:56 +0200
Subject: [PATCH 15/23] unison: rebuild for ocaml-4.14.0_1.
---
srcpkgs/unison/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template
index 783573c120ea..97eb209e2e8c 100644
--- a/srcpkgs/unison/template
+++ b/srcpkgs/unison/template
@@ -1,7 +1,7 @@
# Template file for 'unison'
pkgname=unison
version=2.52.0
-revision=1
+revision=2
hostmakedepends="ocaml"
short_desc="File-synchronization tool"
maintainer="allan <mail@may.mooo.com>"
From fe8d035e92c1eade1478530d9a45ab1db1c72821 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:08:51 +0200
Subject: [PATCH 16/23] camlp5: rebuild for ocaml-4.14.0_1.
---
srcpkgs/camlp5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template
index 2d07ecc842b4..74e0809e16d1 100644
--- a/srcpkgs/camlp5/template
+++ b/srcpkgs/camlp5/template
@@ -1,7 +1,7 @@
# Template file for 'camlp5'
pkgname=camlp5
version=8.00.03
-revision=1
+revision=2
wrksrc="camlp5-rel${version}"
build_style=configure
configure_args="-mandir /usr/share/man"
From 93a503eac28f2dfc487b1def4e26267d01767f27 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:12:31 +0200
Subject: [PATCH 17/23] dune: rebuild for ocaml-4.14.0_1.
---
srcpkgs/dune/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dune/template b/srcpkgs/dune/template
index 178746cfc292..30c34cb44c00 100644
--- a/srcpkgs/dune/template
+++ b/srcpkgs/dune/template
@@ -1,7 +1,7 @@
# Template file for 'dune'
pkgname=dune
version=3.0.3
-revision=1
+revision=2
makedepends="ocaml"
depends="ocaml"
short_desc="Composable build system for OCaml"
From 24ae0c852aec15180641f36cd9c5a6f99af9fe1c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:18:07 +0200
Subject: [PATCH 18/23] New package: ocaml-camlp-streams-5.0
---
srcpkgs/ocaml-camlp-streams/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/ocaml-camlp-streams/template
diff --git a/srcpkgs/ocaml-camlp-streams/template b/srcpkgs/ocaml-camlp-streams/template
new file mode 100644
index 000000000000..ce728427d280
--- /dev/null
+++ b/srcpkgs/ocaml-camlp-streams/template
@@ -0,0 +1,22 @@
+# Template file for 'ocaml-camlp-streams'
+pkgname=ocaml-camlp-streams
+version=5.0
+revision=1
+wrksrc="camlp-streams-${version}"
+makedepends="ocaml dune"
+short_desc="Stream and Genlex libraries for use with Camlp4 and Camlp5"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="LGPL-2.1-only,OCaml-LGPL-linking-exception"
+homepage="https://github.com/ocaml/camlp-streams"
+distfiles="https://github.com/ocaml/camlp-streams/archive/v${version}.tar.gz"
+checksum=daa618bb57a876075a1801d9dcde7dee83635766185f565af913dff43ea4d226
+nocross=yes
+disable_parallel_build=yes
+
+do_build() {
+ dune build --display=short
+}
+do_install() {
+ dune install --prefix=/usr --destdir="$DESTDIR" \
+ --libdir=/usr/lib/ocaml --docdir=/usr/share/doc
+}
From 36bb9b30eb42690511edd05dc77531acd8c76689 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:23:36 +0200
Subject: [PATCH 19/23] camlp5: rebuild for ocaml-4.14.0_1.
---
srcpkgs/camlp5/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template
index 74e0809e16d1..1118f618ba1f 100644
--- a/srcpkgs/camlp5/template
+++ b/srcpkgs/camlp5/template
@@ -1,11 +1,12 @@
# Template file for 'camlp5'
pkgname=camlp5
version=8.00.03
-revision=2
+revision=3
wrksrc="camlp5-rel${version}"
build_style=configure
configure_args="-mandir /usr/share/man"
hostmakedepends="ocaml perl ocaml-findlib"
+makedepends="ocaml-camlp-streams"
short_desc="OCaml preprocessor and pretty-printer"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
From 7c8c5491940abcf2d15c259eaadff27187c5381f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:23:46 +0200
Subject: [PATCH 20/23] coq: rebuild for ocaml-4.14.0_1.
---
srcpkgs/coq/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index fcfbc92cb2f6..5db6a99c5e5e 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,7 +1,7 @@
# Template file for 'coq'
pkgname=coq
version=8.15.1
-revision=1
+revision=2
hostmakedepends="camlp5 dune ocaml ocaml-findlib ocaml-num ocaml-zarith"
short_desc="Proof assistant written in OCaml"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From be4b2fa6f627ee2b6a0d02cdde70501f50829c65 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:30:50 +0200
Subject: [PATCH 21/23] mathcomp: rebuild for coq-8.15.1_2.
---
srcpkgs/mathcomp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index 5946de08e18b..9bdea51dcf48 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -1,7 +1,7 @@
# Template file for 'mathcomp'
pkgname=mathcomp
version=1.14.0
-revision=1
+revision=2
wrksrc="math-comp-mathcomp-${version}"
build_wrksrc="mathcomp"
build_style=gnu-makefile
From 5c43067f50efa4928c27a7c97742a2a9340562cf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:48:14 +0200
Subject: [PATCH 22/23] xen: rebuild for ocaml-4.14.0_1.
---
srcpkgs/xen/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index deb572fe8b9c..cca4b6211bec 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -1,7 +1,7 @@
# Template file for 'xen'
pkgname=xen
version=4.14.1
-revision=5
+revision=6
# grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot
_git_tag_ipxe=4bd064de239dab2426b31c9789a1f4d78087dc63
# TODO: arm / aarch64
@@ -10,8 +10,9 @@ build_style=gnu-configure
configure_args="$(vopt_enable stubdom) --disable-systemd
--with-system-seabios=/usr/share/seabios/bios.bin
--with-sysconfig-leaf-dir=conf.d --with-rundir=/run"
-hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
- ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
+hostmakedepends="acpica-utils automake bin86 bison fig2dev flex gettext
+ ghostscript git ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar
+ texinfo wget"
makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel
From 5e88f7a6b8e530473dddb54abc5a6328b9b8cb6b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 22:03:19 +0200
Subject: [PATCH 23/23] zeroinstall: rebuild for ocaml-4.14.0_1.
---
srcpkgs/zeroinstall/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index eb8e1ea24280..40d8740b1300 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -1,7 +1,7 @@
# Template file for 'zeroinstall'
pkgname=zeroinstall
version=2.17
-revision=5
+revision=6
wrksrc="0install-v${version}"
build_style=gnu-makefile
make_install_target="install_system"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] OCaml 4.14
2022-04-13 19:39 [PR PATCH] Ocaml414 leahneukirchen
` (2 preceding siblings ...)
2022-04-13 20:07 ` leahneukirchen
@ 2022-04-14 12:27 ` leahneukirchen
2022-04-14 14:16 ` [PR PATCH] [Merged]: " leahneukirchen
4 siblings, 0 replies; 6+ messages in thread
From: leahneukirchen @ 2022-04-14 12:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 582 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages ocaml414
https://github.com/void-linux/void-packages/pull/36683
OCaml 4.14
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
TBD:
- [x] zeroinstall: opam doesn't work with 4.14 yet?
- [x] xen: FTBFS due to as86 missing, unrelated?
A patch file from https://github.com/void-linux/void-packages/pull/36683.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ocaml414-36683.patch --]
[-- Type: text/x-diff, Size: 21067 bytes --]
From 90325214d4163d1092a2038cd593b8b2c907c183 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:45:24 +0200
Subject: [PATCH 01/24] ocaml: update to 4.14.0.
---
srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch | 16 ++++++++--------
srcpkgs/ocaml/template | 6 +++---
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
index 333276741c7d..a26f6a639e18 100644
--- a/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
+++ b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
@@ -18,25 +18,25 @@
.globl caml_system__frametable
.type caml_system__frametable, @object
caml_system__frametable:
---- ocaml-4.11.0/configure.ac
-+++ ocaml-4.11.0/configure.ac
+--- ocaml-4.14.0/configure.ac
++++ ocaml-4.14.0/configure.ac
@@ -1006,7 +1006,7 @@ AS_IF([test $arch != "none" && $arch64 ],
# e.g. Ubuntu >= 17.10 for i386, which uses the glibc dynamic loader.
AS_CASE([$arch],
-- [amd64|s390x|none],
-+ [amd64|s390x|power|none],
+- [amd64|arm64|s390x|none],
++ [amd64|arm64|s390x|power|none],
# ocamlopt generates PIC code or doesn't generate code at all
[],
[AS_CASE([$host],
---- ocaml-4.11.0/configure
-+++ ocaml-4.11.0/configure
+--- ocaml-4.14.0/configure
++++ ocaml-4.14.0/configure
@@ -13886,7 +13886,7 @@
# e.g. Ubuntu >= 17.10 for i386, which uses the glibc dynamic loader.
case $arch in #(
-- amd64|s390x|none) :
-+ amd64|s390x|power|none) :
+- amd64|arm64|s390x|none) :
++ amd64|arm64|s390x|power|none) :
# ocamlopt generates PIC code or doesn't generate code at all
;; #(
*) :
diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template
index 629c13791dfe..7de25d70b827 100644
--- a/srcpkgs/ocaml/template
+++ b/srcpkgs/ocaml/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml'
pkgname=ocaml
-version=4.13.1
-revision=2
+version=4.14.0
+revision=1
build_style="gnu-configure"
configure_args="--with-pic --libdir=/usr/lib/ocaml"
make_build_target="world.opt"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="QPL-1.0, LGPL-2.1-only"
homepage="http://ocaml.org/"
distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=194c7988cc1fd1c64f53f32f2f7551e5309e44d914d6efc7e2e4d002296aeac4
+checksum=39f44260382f28d1054c5f9d8bf4753cb7ad64027da792f7938344544da155e8
nocross=yes
export ASPP="cc -c"
From 43b3121f37adc5e54ba9c890178e11abf549635c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:47:06 +0200
Subject: [PATCH 02/24] ocaml-findlib: update to 1.9.3.
---
srcpkgs/ocaml-findlib/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template
index 73cca5a2cafa..04be12e64f51 100644
--- a/srcpkgs/ocaml-findlib/template
+++ b/srcpkgs/ocaml-findlib/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml-findlib'
pkgname=ocaml-findlib
-version=1.9.1
-revision=3
+version=1.9.3
+revision=1
wrksrc="findlib-${version}"
build_style=configure
configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man"
@@ -12,7 +12,7 @@ maintainer="John Regan <john@jrjrtech.com>"
license="MIT"
homepage="http://projects.camlcity.org/projects/findlib.html"
distfiles="http://download.camlcity.org/download/findlib-${version}.tar.gz"
-checksum=2b42b8bd54488d64c4bf3cb7054b4b37bd30c1dc12bd431ea1e4d7ad8a980fe2
+checksum=c310fcb62838d9e50f0b6d6c5ceefcbe4fe056f72496950ae7d5c6cdaae2cc41
nocross=yes
nopie=yes
disable_parallel_build=yes
From cc0ea284c40195dc094d28f398e70cbe9dc16da2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:48:00 +0200
Subject: [PATCH 03/24] ocaml-num: rebuild for ocaml-4.14.0_1.
---
srcpkgs/ocaml-num/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ocaml-num/template b/srcpkgs/ocaml-num/template
index bfce4e7baf91..739ffcf5d419 100644
--- a/srcpkgs/ocaml-num/template
+++ b/srcpkgs/ocaml-num/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml-num'
pkgname=ocaml-num
version=1.4
-revision=3
+revision=4
wrksrc="num-${version}"
build_style=gnu-makefile
make_install_target="findlib-install"
From 37ec99fe481ccb49378f8cc5cca7cc15ba4cc536 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:49:19 +0200
Subject: [PATCH 04/24] ocaml-zarith: rebuild for ocaml-4.14.0_1.
---
srcpkgs/ocaml-zarith/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ocaml-zarith/template b/srcpkgs/ocaml-zarith/template
index d6c12772723d..936b5cd3f607 100644
--- a/srcpkgs/ocaml-zarith/template
+++ b/srcpkgs/ocaml-zarith/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml-zarith'
pkgname=ocaml-zarith
version=1.12
-revision=3
+revision=4
wrksrc="Zarith-release-${version}"
build_style=configure
make_check_target="tests"
From 48d2add0ea5a16c72f12a221e377d61e022cd969 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:50:43 +0200
Subject: [PATCH 05/24] ocamlbuild: rebuild for ocaml-4.14.0_1.
---
srcpkgs/ocamlbuild/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ocamlbuild/template b/srcpkgs/ocamlbuild/template
index 077d5cc7f632..b1349909f784 100644
--- a/srcpkgs/ocamlbuild/template
+++ b/srcpkgs/ocamlbuild/template
@@ -1,7 +1,7 @@
# Template file for 'ocamlbuild'
pkgname=ocamlbuild
version=0.14.1
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="PREFIX=/usr"
make_install_args="PREFIX=/usr"
@@ -13,3 +13,5 @@ homepage="https://github.com/ocaml/ocamlbuild"
distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
checksum=4e1279ff0ef80c862eaa5207a77020d741e89ef94f0e4a92a37c4188dbf08256
nocross=yes
+
+export CHECK_IF_PREINSTALLED=false
From a6f6ae892d5405d07486e4001ecc617d468cf9a3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:51:59 +0200
Subject: [PATCH 06/24] ocaml-stdcompat: update to 18.
---
srcpkgs/ocaml-stdcompat/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ocaml-stdcompat/template b/srcpkgs/ocaml-stdcompat/template
index 2035a9a2c4fa..65a0d6fbc78f 100644
--- a/srcpkgs/ocaml-stdcompat/template
+++ b/srcpkgs/ocaml-stdcompat/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml-stdcompat'
pkgname=ocaml-stdcompat
-version=16
-revision=2
+version=18
+revision=1
wrksrc="stdcompat-${version}"
build_style=gnu-configure
configure_args="--libdir=/usr/lib/ocaml"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-2-Clause"
homepage="https://github.com/thierry-martinez/stdcompat"
distfiles="https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz"
-checksum=100152e25f138351cb265146cd8717fa9dbfbff54b48ce771e30a4e05fc1ec09
+checksum=483a8d526eb19709a1a3092fb8978302e3a9d3bb783d807fb9ee53d96c3ec607
nocross=yes
disable_parallel_build=yes
From 85fe7c410b6cb6e6971938ec67449d597242983e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:53:13 +0200
Subject: [PATCH 07/24] hivex: rebuild for ocaml-4.14.0_1.
---
srcpkgs/hivex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 448c06ddc9fa..f6f12d1b70f3 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
# Template file for 'hivex'
pkgname=hivex
version=1.3.21
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--disable-ocaml" # currently ocaml is broken
hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
From 775e3b97c7dcb55fde79c8d21e8e26948db80dd5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:53:32 +0200
Subject: [PATCH 08/24] opam: rebuild for ocaml-4.14.0_1.
---
srcpkgs/opam/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index 236a2f963b70..ca5c64092ac8 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
# Template file for 'opam'
pkgname=opam
version=2.1.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--docdir=/usr/share/doc/${pkgname}"
make_build_args="lib-ext all"
From a7bdd8fdb380614f9c3ec43930291f076775f504 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:53:52 +0200
Subject: [PATCH 09/24] ocaml-lablgtk2: rebuild for ocaml-4.14.0_1.
---
srcpkgs/ocaml-lablgtk2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ocaml-lablgtk2/template b/srcpkgs/ocaml-lablgtk2/template
index c835e6b19d5d..6ff864eb1720 100644
--- a/srcpkgs/ocaml-lablgtk2/template
+++ b/srcpkgs/ocaml-lablgtk2/template
@@ -1,7 +1,7 @@
# Template file for 'ocaml-lablgtk2'
pkgname=ocaml-lablgtk2
version=2.18.10
-revision=4
+revision=5
wrksrc="lablgtk-${version}"
build_style=gnu-configure
configure_args="--without-glade --without-gnomeui --without-gtksourceview"
From 687cf9e8f61b7b67c34de88a6f05c8af4eefdb3a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:56:12 +0200
Subject: [PATCH 10/24] pdfsandwich: rebuild for ocaml-4.14.0_1.
---
srcpkgs/pdfsandwich/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pdfsandwich/template b/srcpkgs/pdfsandwich/template
index f3603e064c90..82f2f934fdc1 100644
--- a/srcpkgs/pdfsandwich/template
+++ b/srcpkgs/pdfsandwich/template
@@ -1,7 +1,7 @@
# Template file for 'pdfsandwich'
pkgname=pdfsandwich
version=0.1.7
-revision=5
+revision=6
build_style=gnu-configure
hostmakedepends="ocaml perl"
makedepends="ocaml"
From 2063764e7c96711a3f04d6fb709b99e2241c8f62 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:56:17 +0200
Subject: [PATCH 11/24] supermin: rebuild for ocaml-4.14.0_1.
---
srcpkgs/supermin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supermin/template b/srcpkgs/supermin/template
index 357fc3f255f8..5f80c3515b3d 100644
--- a/srcpkgs/supermin/template
+++ b/srcpkgs/supermin/template
@@ -1,7 +1,7 @@
# Template file for 'supermin'
pkgname=supermin
version=5.2.2
-revision=1
+revision=2
_release_series=5.2-stable
build_style=gnu-configure
hostmakedepends="ocaml ocaml-findlib pkg-config e2fsprogs cpio perl"
From df677c044512a557ddc7b022a813b80744fcdd22 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:56:24 +0200
Subject: [PATCH 12/24] z3: rebuild for ocaml-4.14.0_1.
---
srcpkgs/z3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index 2d5bf7a80954..dea059c98d0c 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,7 +1,7 @@
# Template file for 'z3'
pkgname=z3
version=4.8.15
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=configure
configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"
From 35f4f526e75fdacbd72d86ba49b635109b3ab671 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:01:53 +0200
Subject: [PATCH 13/24] coccinelle: rebuild for ocaml-4.14.0_1.
---
srcpkgs/coccinelle/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/coccinelle/template b/srcpkgs/coccinelle/template
index 211c9bdb4394..709b45fd2f69 100644
--- a/srcpkgs/coccinelle/template
+++ b/srcpkgs/coccinelle/template
@@ -1,7 +1,7 @@
# Template file for 'coccinelle'
pkgname=coccinelle
version=1.1.0
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-pdflatex --enable-release --enable-opt
--with-python=/usr/bin/python3"
From db420e3f299f006aaba8ef41801332cbcaae3ea8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:03:56 +0200
Subject: [PATCH 14/24] libguestfs: rebuild for ocaml-4.14.0_1.
---
srcpkgs/libguestfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 8d669017077e..c6c56f8142b7 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,7 +1,7 @@
# Template file for 'libguestfs'
pkgname=libguestfs
version=1.48.0
-revision=1
+revision=2
_version_short=${version%.*}
build_style=gnu-configure
make_install_args="INSTALLDIRS=vendor"
From 820d274846ad7e49b7b7193172020235a3b76804 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:04:56 +0200
Subject: [PATCH 15/24] unison: rebuild for ocaml-4.14.0_1.
---
srcpkgs/unison/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template
index 783573c120ea..97eb209e2e8c 100644
--- a/srcpkgs/unison/template
+++ b/srcpkgs/unison/template
@@ -1,7 +1,7 @@
# Template file for 'unison'
pkgname=unison
version=2.52.0
-revision=1
+revision=2
hostmakedepends="ocaml"
short_desc="File-synchronization tool"
maintainer="allan <mail@may.mooo.com>"
From 595ee6ed32033a9b3fc6e05d9109bc80ce45ef0c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:08:51 +0200
Subject: [PATCH 16/24] camlp5: rebuild for ocaml-4.14.0_1.
---
srcpkgs/camlp5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template
index 2d07ecc842b4..74e0809e16d1 100644
--- a/srcpkgs/camlp5/template
+++ b/srcpkgs/camlp5/template
@@ -1,7 +1,7 @@
# Template file for 'camlp5'
pkgname=camlp5
version=8.00.03
-revision=1
+revision=2
wrksrc="camlp5-rel${version}"
build_style=configure
configure_args="-mandir /usr/share/man"
From 7ca6ccf733031c1f687deec8a236a5b87b5d2ac0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:12:31 +0200
Subject: [PATCH 17/24] dune: rebuild for ocaml-4.14.0_1.
---
srcpkgs/dune/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dune/template b/srcpkgs/dune/template
index 178746cfc292..30c34cb44c00 100644
--- a/srcpkgs/dune/template
+++ b/srcpkgs/dune/template
@@ -1,7 +1,7 @@
# Template file for 'dune'
pkgname=dune
version=3.0.3
-revision=1
+revision=2
makedepends="ocaml"
depends="ocaml"
short_desc="Composable build system for OCaml"
From 51e91ed20ba13f05dcf9890dfc28729848f8525d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:18:07 +0200
Subject: [PATCH 18/24] New package: ocaml-camlp-streams-5.0
---
srcpkgs/ocaml-camlp-streams/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/ocaml-camlp-streams/template
diff --git a/srcpkgs/ocaml-camlp-streams/template b/srcpkgs/ocaml-camlp-streams/template
new file mode 100644
index 000000000000..ce728427d280
--- /dev/null
+++ b/srcpkgs/ocaml-camlp-streams/template
@@ -0,0 +1,22 @@
+# Template file for 'ocaml-camlp-streams'
+pkgname=ocaml-camlp-streams
+version=5.0
+revision=1
+wrksrc="camlp-streams-${version}"
+makedepends="ocaml dune"
+short_desc="Stream and Genlex libraries for use with Camlp4 and Camlp5"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="LGPL-2.1-only,OCaml-LGPL-linking-exception"
+homepage="https://github.com/ocaml/camlp-streams"
+distfiles="https://github.com/ocaml/camlp-streams/archive/v${version}.tar.gz"
+checksum=daa618bb57a876075a1801d9dcde7dee83635766185f565af913dff43ea4d226
+nocross=yes
+disable_parallel_build=yes
+
+do_build() {
+ dune build --display=short
+}
+do_install() {
+ dune install --prefix=/usr --destdir="$DESTDIR" \
+ --libdir=/usr/lib/ocaml --docdir=/usr/share/doc
+}
From 1f6d992782436948691a4d3f0431b948fe057322 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:23:36 +0200
Subject: [PATCH 19/24] camlp5: rebuild for ocaml-4.14.0_1.
---
srcpkgs/camlp5/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template
index 74e0809e16d1..1118f618ba1f 100644
--- a/srcpkgs/camlp5/template
+++ b/srcpkgs/camlp5/template
@@ -1,11 +1,12 @@
# Template file for 'camlp5'
pkgname=camlp5
version=8.00.03
-revision=2
+revision=3
wrksrc="camlp5-rel${version}"
build_style=configure
configure_args="-mandir /usr/share/man"
hostmakedepends="ocaml perl ocaml-findlib"
+makedepends="ocaml-camlp-streams"
short_desc="OCaml preprocessor and pretty-printer"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
From 19934b77b3829525552a5117b6d919930219d9fb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:23:46 +0200
Subject: [PATCH 20/24] coq: rebuild for ocaml-4.14.0_1.
---
srcpkgs/coq/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index fcfbc92cb2f6..5db6a99c5e5e 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,7 +1,7 @@
# Template file for 'coq'
pkgname=coq
version=8.15.1
-revision=1
+revision=2
hostmakedepends="camlp5 dune ocaml ocaml-findlib ocaml-num ocaml-zarith"
short_desc="Proof assistant written in OCaml"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From 866017b4906a3ec56eaabc3c325c5593b0518590 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:30:50 +0200
Subject: [PATCH 21/24] mathcomp: rebuild for coq-8.15.1_2.
---
srcpkgs/mathcomp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index 5946de08e18b..9bdea51dcf48 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -1,7 +1,7 @@
# Template file for 'mathcomp'
pkgname=mathcomp
version=1.14.0
-revision=1
+revision=2
wrksrc="math-comp-mathcomp-${version}"
build_wrksrc="mathcomp"
build_style=gnu-makefile
From bdbb0afc39ee35ed47f596296f412b121dbf43a0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:48:14 +0200
Subject: [PATCH 22/24] xen: rebuild for ocaml-4.14.0_1.
---
srcpkgs/xen/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index deb572fe8b9c..cca4b6211bec 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -1,7 +1,7 @@
# Template file for 'xen'
pkgname=xen
version=4.14.1
-revision=5
+revision=6
# grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot
_git_tag_ipxe=4bd064de239dab2426b31c9789a1f4d78087dc63
# TODO: arm / aarch64
@@ -10,8 +10,9 @@ build_style=gnu-configure
configure_args="$(vopt_enable stubdom) --disable-systemd
--with-system-seabios=/usr/share/seabios/bios.bin
--with-sysconfig-leaf-dir=conf.d --with-rundir=/run"
-hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
- ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
+hostmakedepends="acpica-utils automake bin86 bison fig2dev flex gettext
+ ghostscript git ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar
+ texinfo wget"
makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel
From a3c9d2926d949f19255989b9cd6b4fb061f939ce Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 22:03:19 +0200
Subject: [PATCH 23/24] zeroinstall: rebuild for ocaml-4.14.0_1.
---
srcpkgs/zeroinstall/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index eb8e1ea24280..40d8740b1300 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -1,7 +1,7 @@
# Template file for 'zeroinstall'
pkgname=zeroinstall
version=2.17
-revision=5
+revision=6
wrksrc="0install-v${version}"
build_style=gnu-makefile
make_install_target="install_system"
From 39ac2591b937e42584d396f24ea6da8913a21a18 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Apr 2022 14:27:09 +0200
Subject: [PATCH 24/24] opam: disable tests in ci.
---
srcpkgs/opam/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index ca5c64092ac8..dd27afd02a0d 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -17,6 +17,7 @@ distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
checksum=735e717532f135064940fe3fef573acce6b1bbdc5e146470c2ac20fc8510a470
nocross=yes
disable_parallel_build=yes
+make_check=ci-skip # uses bwrap
post_install() {
rm -rf ${DESTDIR}/usr/doc
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: OCaml 4.14
2022-04-13 19:39 [PR PATCH] Ocaml414 leahneukirchen
` (3 preceding siblings ...)
2022-04-14 12:27 ` leahneukirchen
@ 2022-04-14 14:16 ` leahneukirchen
4 siblings, 0 replies; 6+ messages in thread
From: leahneukirchen @ 2022-04-14 14:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 411 bytes --]
There's a merged pull request on the void-packages repository
OCaml 4.14
https://github.com/void-linux/void-packages/pull/36683
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
TBD:
- [x] zeroinstall: opam doesn't work with 4.14 yet?
- [x] xen: FTBFS due to as86 missing, unrelated?
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-04-14 14:16 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-13 19:39 [PR PATCH] Ocaml414 leahneukirchen
2022-04-13 19:40 ` [PR PATCH] [Updated] OCaml 4.14 leahneukirchen
2022-04-13 19:41 ` leahneukirchen
2022-04-13 20:07 ` leahneukirchen
2022-04-14 12:27 ` leahneukirchen
2022-04-14 14:16 ` [PR PATCH] [Merged]: " leahneukirchen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).