* [PR PATCH] Ocaml 4.11
@ 2020-08-20 13:39 leahneukirchen
2020-08-20 15:01 ` [PR PATCH] [Merged]: " leahneukirchen
0 siblings, 1 reply; 2+ messages in thread
From: leahneukirchen @ 2020-08-20 13:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 348 bytes --]
There is a new pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages ocaml411
https://github.com/void-linux/void-packages/pull/24381
Ocaml 4.11
Was quite painless, I also bumped Coq.
A patch file from https://github.com/void-linux/void-packages/pull/24381.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ocaml411-24381.patch --]
[-- Type: text/x-diff, Size: 15600 bytes --]
From 2cd1b3236f60412873f42333af5d5b92e847fd3f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 20 Aug 2020 14:21:57 +0200
Subject: [PATCH 01/20] ocaml: update to 4.11.0.
---
srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch | 12 ++++++------
srcpkgs/ocaml/template | 4 ++--
2 files changed, 8 insertions(+), 8 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 138f8185f85..8f8a0d747e4 100644
--- a/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
+++ b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
@@ -1,9 +1,9 @@
---- ocaml-4.08.0/asmcomp/emitaux.ml
-+++ ocaml-4.08.0/asmcomp/emitaux.ml
-@@ -213,6 +213,7 @@ let emit_frames a =
- | None -> a.efa_word 0
- end
- in
+--- ocaml-4.11.0/asmcomp/emitaux.ml
++++ ocaml-4.11.0/asmcomp/emitaux.ml
+@@ -268,6 +268,7 @@
+ match rdbg with
+ | [] -> assert false
+ | d :: rest -> emit rs d rest in
+ a.efa_align Arch.size_addr;
a.efa_word (List.length !frame_descriptors);
List.iter emit_frame !frame_descriptors;
diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template
index 613e47c9547..64b8aba83a1 100644
--- a/srcpkgs/ocaml/template
+++ b/srcpkgs/ocaml/template
@@ -1,6 +1,6 @@
# Template file for 'ocaml'
pkgname=ocaml
-version=4.10.0
+version=4.11.0
revision=1
build_style="gnu-configure"
configure_args="--with-pic --disable-force-safe-string"
@@ -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=58bae0f0a79daf86ec755a173e593fef4ef588f15c6185993af88ceb9722bc39
+checksum=060a26420ad868e192076138a103dbe28fa39d7a0a80f7db349a1d5143dea506
nocross=yes
patch_args="-Np1"
From 7e9115b0b46ee4f55b811510e08bcc30764c03a1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 20 Aug 2020 14:22:14 +0200
Subject: [PATCH 02/20] ocaml-num: rebuild for ocaml-4.11.0.
---
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 8f72890d27f..ac4bf0f7666 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.3
-revision=2
+revision=3
build_style=gnu-makefile
makedepends="ocaml ocaml-findlib"
make_install_target="findlib-install"
From d9ae397094caaaead2fbf3230fc90eb1ec262925 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 20 Aug 2020 14:22:36 +0200
Subject: [PATCH 03/20] ocaml-zarith: rebuild for ocaml-4.11.0.
---
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 426e4894155..65f9d4c0b9e 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.9.1
-revision=2
+revision=3
wrksrc="Zarith-release-${version}"
build_style=configure
make_check_target="tests"
From c5d3f762e63321d94861865d7e5e201922ca86c2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 20 Aug 2020 14:22:51 +0200
Subject: [PATCH 04/20] ocaml-findlib: rebuild for ocaml-4.11.0.
---
srcpkgs/ocaml-findlib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template
index a97ebe84e59..93ec4b9e6bc 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.8.1
-revision=3
+revision=4
build_style=configure
configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man"
make_build_args="all opt"
From 4ddd047448b89efa8f4ef1c6e9b6bb097da0773f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 20 Aug 2020 14:23:06 +0200
Subject: [PATCH 05/20] ocamlbuild: rebuild for ocaml-4.11.0.
---
srcpkgs/ocamlbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ocamlbuild/template b/srcpkgs/ocamlbuild/template
index 6eb827ff68e..c0caeba4be2 100644
--- a/srcpkgs/ocamlbuild/template
+++ b/srcpkgs/ocamlbuild/template
@@ -1,7 +1,7 @@
# Template file for 'ocamlbuild'
pkgname=ocamlbuild
version=0.14.0
-revision=4
+revision=5
build_style=gnu-makefile
make_build_args="PREFIX=/usr"
make_install_args="PREFIX=/usr"
From 8bf18c0eedb434f4db3e8d8c87e64a68883b042b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 20 Aug 2020 14:25:31 +0200
Subject: [PATCH 06/20] camlp5: rebuild for ocaml-4.11.0.
---
srcpkgs/camlp5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template
index af8e5a0fec8..596b9b67823 100644
--- a/srcpkgs/camlp5/template
+++ b/srcpkgs/camlp5/template
@@ -1,7 +1,7 @@
# Template file for 'camlp5'
pkgname=camlp5
version=7.12
-revision=1
+revision=2
build_style=configure
configure_args="-mandir /usr/share/man"
hostmakedepends="ocaml"
From accf598494c2d1f4d89f8f424775aea4fcee043f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 20 Aug 2020 14:26:03 +0200
Subject: [PATCH 07/20] coccinelle: rebuild for ocaml-4.11.0.
---
srcpkgs/coccinelle/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/coccinelle/template b/srcpkgs/coccinelle/template
index 20d0c536133..85939a89d5c 100644
--- a/srcpkgs/coccinelle/template
+++ b/srcpkgs/coccinelle/template
@@ -1,7 +1,7 @@
# Template file for 'coccinelle'
pkgname=coccinelle
version=1.0.8
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-pdflatex --enable-release
--with-python=/usr/bin/python3"
From 0b5d3a1490bf320f217bb02ce4332ac4c5a046a1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 20 Aug 2020 14:27:19 +0200
Subject: [PATCH 08/20] hivex: rebuild for ocaml-4.11.0.
---
srcpkgs/hivex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index c72b8ee99a4..1e7b769886e 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
# Template file for 'hivex'
pkgname=hivex
version=1.3.19
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-ocaml" # currently ocaml is broken
hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
From 89acae1e21eee66f23f1eda432cb151eb4697921 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 20 Aug 2020 14:29:32 +0200
Subject: [PATCH 09/20] opam: rebuild for ocaml-4.11.0.
---
srcpkgs/opam/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index ca44a37fddb..1c24acba342 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
# Template file for 'opam'
pkgname=opam
version=2.0.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--docdir=/usr/share/doc/${pkgname}"
make_build_args="lib-ext all"
From d3d70d9781d080e25d9c325b3768b18dd181cb3e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 20 Aug 2020 14:32:30 +0200
Subject: [PATCH 10/20] ocaml-lablgtk2: rebuild for ocaml-4.11.0.
---
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 260aeddf528..b9389c1fff4 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=1
+revision=2
wrksrc="lablgtk-${version}"
build_style=gnu-configure
configure_args="--without-glade --without-gnomeui --without-gtksourceview"
From b09ba9c1149df43a503ab73f214214214caec91a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 20 Aug 2020 14:38:18 +0200
Subject: [PATCH 11/20] pdfsandwich: rebuild for ocaml-4.11.0.
---
srcpkgs/pdfsandwich/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pdfsandwich/template b/srcpkgs/pdfsandwich/template
index 257b4f22783..e96cfc08114 100644
--- a/srcpkgs/pdfsandwich/template
+++ b/srcpkgs/pdfsandwich/template
@@ -1,7 +1,7 @@
# Template file for 'pdfsandwich'
pkgname=pdfsandwich
version=0.1.7
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="gawk ocaml"
makedepends="ocaml"
From 1577d23f646998590857592ed8c3f566f447e0f9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 20 Aug 2020 14:38:35 +0200
Subject: [PATCH 12/20] polygen: rebuild for ocaml-4.11.0.
---
srcpkgs/polygen/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/polygen/template b/srcpkgs/polygen/template
index f36e9c8c008..c66f6a37aa5 100644
--- a/srcpkgs/polygen/template
+++ b/srcpkgs/polygen/template
@@ -1,7 +1,7 @@
# Template file for 'polygen'
pkgname=polygen
version=1.0.6.ds2
-revision=6
+revision=7
build_style=gnu-makefile
build_wrksrc="src"
hostmakedepends="ocaml unzip"
From b11daeb51ccb182f5c227055827c9c101fca3d70 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 20 Aug 2020 14:38:48 +0200
Subject: [PATCH 13/20] supermin: rebuild for ocaml-4.11.0.
---
srcpkgs/supermin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supermin/template b/srcpkgs/supermin/template
index 6dbc5d5f7a4..0a038892340 100644
--- a/srcpkgs/supermin/template
+++ b/srcpkgs/supermin/template
@@ -1,7 +1,7 @@
# Template file for 'supermin'
pkgname=supermin
version=5.2.0
-revision=1
+revision=2
_release_series=5.2-stable
build_style=gnu-configure
hostmakedepends="ocaml ocaml-findlib pkg-config e2fsprogs cpio perl"
From 0cf88b2b21818180b73945b0d9da63eef711f3fd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 20 Aug 2020 14:38:57 +0200
Subject: [PATCH 14/20] unison: rebuild for ocaml-4.11.0.
---
srcpkgs/unison/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template
index f93ac3aec79..a24b2cf3552 100644
--- a/srcpkgs/unison/template
+++ b/srcpkgs/unison/template
@@ -1,7 +1,7 @@
# Template file for 'unison'
pkgname="unison"
version=2.51.2
-revision=5
+revision=6
hostmakedepends="ocaml"
short_desc="A file-synchronization tool"
maintainer="allan <mail@may.mooo.com>"
From 082557c306f9f3ce55e898028d4e3e68ac52b6c3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 20 Aug 2020 14:41:26 +0200
Subject: [PATCH 15/20] z3: rebuild for ocaml-4.11.0.
---
srcpkgs/z3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index ecb5dabac5b..36c3f476508 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,7 +1,7 @@
# Template file for 'z3'
pkgname=z3
version=4.8.8
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=configure
configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"
From e0be272685b095bde45462b78b6ffa470de69a7a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 20 Aug 2020 14:51:34 +0200
Subject: [PATCH 16/20] zeroinstall: rebuild for ocaml-4.11.0.
---
srcpkgs/zeroinstall/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 817adfdc493..3022800b9e2 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -1,7 +1,7 @@
# Template file for 'zeroinstall'
pkgname=zeroinstall
version=2.17
-revision=1
+revision=2
wrksrc="0install-v${version}"
build_style=gnu-makefile
make_install_target="install_system"
From 884f5074858d2b70941a4d242088b18ed8f4394a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 20 Aug 2020 15:29:24 +0200
Subject: [PATCH 17/20] libguestfs: rebuild for ocaml-4.11.0.
---
srcpkgs/libguestfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 22356f78e0c..b731842cdbb 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,14 +1,14 @@
# Template file for 'libguestfs'
pkgname=libguestfs
version=1.42.0
-revision=2
+revision=3
_version_short=${version%.*}
build_style=gnu-configure
make_install_args="INSTALLDIRS=vendor"
configure_args="--disable-static --disable-probes --disable-appliance
--disable-daemon --without-java --enable-introspection=no
--disable-erlang --disable-haskell --disable-gobject --without-gtk
- --with-distro=VoidLinux
+ --with-distro=VoidLinux ac_cv_prog_NCURSES_CONFIG=ncursesw6-config
$(vopt_enable ruby) $(vopt_enable python) $(vopt_enable go golang)
$(vopt_enable php) $(vopt_enable lua) $(vopt_enable fuse)"
hostmakedepends="cpio gperf cdrtools flex pkg-config automake libtool qemu git
From 1c869c708ceefc8995116f5bcc3ef41daf35da8e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 20 Aug 2020 15:38:25 +0200
Subject: [PATCH 18/20] xen: rebuild for ocaml-4.11.0.
---
srcpkgs/xen/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index c2011f5c25f..5f65abb8c0d 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -1,7 +1,7 @@
# Template file for 'xen'
pkgname=xen
version=4.10.4
-revision=4
+revision=5
# grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot
_git_tag_ipxe=356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d
archs="x86_64*"
From a6d357d2d9214d8392ae9dbb4996454c0e15eed8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 20 Aug 2020 15:29:13 +0200
Subject: [PATCH 19/20] coq: update to 8.12.0.
---
srcpkgs/coq/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index 967318c9d00..d700c176c63 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,6 +1,6 @@
# Template file for 'coq'
pkgname=coq
-version=8.11.2
+version=8.12.0
revision=1
hostmakedepends="ocaml ocaml-findlib ocaml-num camlp5"
short_desc="Proof assistant written in OCaml"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="LGPL-2.1-only"
homepage="https://coq.inria.fr"
distfiles="https://github.com/coq/coq/archive/V${version}.tar.gz"
-checksum=98cb9e12ba2508a1ca59e0c638fce27bf95c37082b6f7ce355779b80b25e1bfd
+checksum=ecde14c6132f5abb459e7f4724788788928174ad4484fff88e86b0086779bcee
nopie=yes
nocross=yes
From 29bb36d34ba6ba0c585d44a24e9eb884647a0895 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 20 Aug 2020 15:06:23 +0200
Subject: [PATCH 20/20] mathcomp: rebuild for coq-8.12.0.
---
srcpkgs/mathcomp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index 79b433dacbd..f0c374f2279 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -1,7 +1,7 @@
# Template file for 'mathcomp'
pkgname=mathcomp
version=1.11.0
-revision=1
+revision=2
wrksrc="math-comp-mathcomp-${version}"
build_wrksrc="mathcomp"
build_style=gnu-makefile
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: Ocaml 4.11
2020-08-20 13:39 [PR PATCH] Ocaml 4.11 leahneukirchen
@ 2020-08-20 15:01 ` leahneukirchen
0 siblings, 0 replies; 2+ messages in thread
From: leahneukirchen @ 2020-08-20 15:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 182 bytes --]
There's a merged pull request on the void-packages repository
Ocaml 4.11
https://github.com/void-linux/void-packages/pull/24381
Description:
Was quite painless, I also bumped Coq.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-08-20 15:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-20 13:39 [PR PATCH] Ocaml 4.11 leahneukirchen
2020-08-20 15:01 ` [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).