* [PR PATCH] [WIP] OCaml 4.08
@ 2019-06-14 9:14 voidlinux-github
2019-06-14 9:16 ` voidlinux-github
` (8 more replies)
0 siblings, 9 replies; 10+ messages in thread
From: voidlinux-github @ 2019-06-14 9:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 530 bytes --]
There is a new pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages ocaml408
https://github.com/void-linux/void-packages/pull/12451
[WIP] OCaml 4.08
Missing/broken:
- [ ] ELFv2 patches for ppc64 (@q66)
- [ ] verifast
- [ ] coq
- [ ] mldonkey
- [ ] wyrd
- [ ] ocaml-lablgtk2
- [ ] unison
- [ ] pfff
- [ ] coccinelle
- [ ] camlp5
- [ ] camlp4
- [ ] opam
A patch file from https://github.com/void-linux/void-packages/pull/12451.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ocaml408-12451.patch --]
[-- Type: application/text/x-diff, Size: 13235 bytes --]
From 747c68001f94f6bc6d97c41791abffe600ed0791 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:32:28 +0200
Subject: [PATCH 1/7] ocaml: update to 4.08.0.
---
.../ocaml/patches/ocaml-4.04.2-elfv2.patch | 198 ------------------
srcpkgs/ocaml/patches/ocaml-4.04.2-pie.patch | 20 --
.../patches/ocaml-4.04.2-sigcontext.patch | 19 --
srcpkgs/ocaml/template | 12 +-
4 files changed, 5 insertions(+), 244 deletions(-)
delete mode 100644 srcpkgs/ocaml/patches/ocaml-4.04.2-elfv2.patch
delete mode 100644 srcpkgs/ocaml/patches/ocaml-4.04.2-pie.patch
delete mode 100644 srcpkgs/ocaml/patches/ocaml-4.04.2-sigcontext.patch
diff --git a/srcpkgs/ocaml/patches/ocaml-4.04.2-elfv2.patch b/srcpkgs/ocaml/patches/ocaml-4.04.2-elfv2.patch
deleted file mode 100644
index d1d195765ca..00000000000
--- a/srcpkgs/ocaml/patches/ocaml-4.04.2-elfv2.patch
+++ /dev/null
@@ -1,198 +0,0 @@
---- ocaml-4.04.2/asmcomp/power/arch.ml
-+++ ocaml-4.04.2/asmcomp/power/arch.ml
-@@ -28,7 +28,7 @@ type abi = ELF32 | ELF64v1 | ELF64v2
- let abi =
- match Config.model with
- | "ppc" -> ELF32
-- | "ppc64" -> ELF64v1
-+ | "ppc64" -> ELF64v2
- | "ppc64le" -> ELF64v2
- | _ -> assert false
-
---- ocaml-4.04.2/asmrun/power.S
-+++ ocaml-4.04.2/asmrun/power.S
-@@ -13,7 +13,7 @@
- /* */
- /**************************************************************************/
-
--#if defined(MODEL_ppc64le)
-+#if _CALL_ELF == 2
- .abiversion 2
- #endif
-
-@@ -41,8 +41,7 @@
- #define TRAP_PREVIOUS_OFFSET 4
- #define CALLBACK_LINK_SIZE 16
- #define CALLBACK_LINK_OFFSET 0
--#endif
--#if defined(MODEL_ppc64)
-+#elif _CALL_ELF == 1
- #define RESERVED_STACK 48
- #define PARAM_SAVE_AREA (8*8)
- #define LR_SAVE 16
-@@ -53,8 +52,7 @@
- #define TRAP_PREVIOUS_OFFSET 64
- #define CALLBACK_LINK_SIZE 32
- #define CALLBACK_LINK_OFFSET 48
--#endif
--#if defined(MODEL_ppc64le)
-+#elif _CALL_ELF == 2
- #define RESERVED_STACK 32
- #define PARAM_SAVE_AREA 0
- #define LR_SAVE 16
-@@ -80,9 +78,8 @@
- #define ENDFUNCTION(name) \
- .size name, . - name
-
--#endif
-
--#if defined(MODEL_ppc64)
-+#elif _CALL_ELF == 1
- #define FUNCTION(name) \
- .section ".opd","aw"; \
- .align 3; \
-@@ -96,9 +93,8 @@
- #define ENDFUNCTION(name) \
- .size name, . - .L.name
-
--#endif
-
--#if defined(MODEL_ppc64le)
-+#elif _CALL_ELF == 2
- #define FUNCTION(name) \
- .section ".text"; \
- .globl name; \
-@@ -157,7 +153,7 @@
-
- #endif
-
--#if defined(MODEL_ppc64)
-+#if _CALL_ELF == 1
- .section ".opd","aw"
- #else
- .section ".text"
-@@ -338,14 +334,14 @@ FUNCTION(caml_c_call)
- #if defined(MODEL_ppc)
- mtctr 28
- bctrl
--#elif defined(MODEL_ppc64)
-+#elif _CALL_ELF == 1
- ld 0, 0(28)
- mr 26, 2 /* save current TOC in a callee-save register */
- mtctr 0
- ld 2, 8(28)
- bctrl
- mr 2, 26 /* restore current TOC */
--#elif defined(MODEL_ppc64le)
-+#elif _CALL_ELF == 2
- mtctr 28
- mr 12, 28
- mr 26, 2 /* save current TOC in a callee-save register */
-@@ -514,14 +510,14 @@ FUNCTION(caml_start_program)
- #if defined(MODEL_ppc)
- mtctr 12
- .L105: bctrl
--#elif defined(MODEL_ppc64)
-+#elif _CALL_ELF == 1
- ld 0, 0(12)
- mtctr 0
- std 2, TOC_SAVE(1)
- ld 2, 8(12)
- .L105: bctrl
- ld 2, TOC_SAVE(1)
--#elif defined(MODEL_ppc64le)
-+#elif _CALL_ELF == 2
- mtctr 12
- std 2, TOC_SAVE(1)
- .L105: bctrl
-@@ -634,7 +630,7 @@ FUNCTION(caml_callback3_exn)
- b .L102
- ENDFUNCTION(caml_callback3_exn)
-
--#if defined(MODEL_ppc64)
-+#if _CALL_ELF == 1
- .section ".opd","aw"
- #else
- .section ".text"
---- ocaml-4.04.2/testsuite/tests/asmgen/power.S
-+++ ocaml-4.04.2/testsuite/tests/asmgen/power.S
-@@ -25,12 +25,10 @@
- #if defined(MODEL_ppc)
- #define RESERVED_STACK 16
- #define LR_SAVE_AREA 4
--#endif
--#if defined(MODEL_ppc64)
-+#elif _CALL_ELF == 1
- #define RESERVED_STACK 48
- #define LR_SAVE_AREA 16
--#endif
--#if defined(MODEL_ppc64le)
-+#elif _CALL_ELF == 2
- #define RESERVED_STACK 32
- #define LR_SAVE_AREA 16
- #endif
-@@ -44,9 +42,8 @@
- .type name, @function; \
- .align 2; \
- name:
--#endif
-
--#if defined(MODEL_ppc64)
-+#elif _CALL_ELF == 1
- #define FUNCTION(name) \
- .section ".opd","aw"; \
- .align 3; \
-@@ -56,9 +53,8 @@
- .text; \
- .align 2; \
- .L.name:
--#endif
-
--#if defined(MODEL_ppc64le)
-+#elif _CALL_ELF == 2
- #define FUNCTION(name) \
- .section ".text"; \
- .globl name; \
-@@ -118,11 +114,11 @@ FUNCTION(call_gen_code)
- /* Get function pointer in CTR */
- #if defined(MODEL_ppc)
- mtctr 3
--#elif defined(MODEL_ppc64)
-+#elif _CALL_ELF == 1
- ld 0, 0(3)
- mtctr 0
- ld 2, 8(3)
--#elif defined(MODEL_ppc64le)
-+#elif _CALL_ELF == 2
- mtctr 3
- mr 12, 3
- #else
-@@ -184,11 +180,11 @@ FUNCTION(caml_c_call)
- /* Jump to C function (address in r28) */
- #if defined(MODEL_ppc)
- mtctr 28
--#elif defined(MODEL_ppc64)
-+#elif _CALL_ELF == 1
- ld 0, 0(28)
- mtctr 0
- ld 2, 8(28)
--#elif defined(MODEL_ppc64le)
-+#elif _CALL_ELF == 2
- mtctr 28
- mr 12, 28
- #else
---- ocaml-4.04.2/byterun/caml/stack.h
-+++ ocaml-4.04.2/byterun/caml/stack.h
-@@ -40,10 +40,10 @@
- #if defined(MODEL_ppc)
- #define Saved_return_address(sp) *((intnat *)((sp) - 4))
- #define Callback_link(sp) ((struct caml_context *)((sp) + 16))
--#elif defined(MODEL_ppc64)
-+#elif _CALL_ELF == 1
- #define Saved_return_address(sp) *((intnat *)((sp) + 16))
- #define Callback_link(sp) ((struct caml_context *)((sp) + (48 + 32)))
--#elif defined(MODEL_ppc64le)
-+#elif _CALL_ELF == 2
- #define Saved_return_address(sp) *((intnat *)((sp) + 16))
- #define Callback_link(sp) ((struct caml_context *)((sp) + (32 + 32)))
- #else
diff --git a/srcpkgs/ocaml/patches/ocaml-4.04.2-pie.patch b/srcpkgs/ocaml/patches/ocaml-4.04.2-pie.patch
deleted file mode 100644
index 6aed5844d33..00000000000
--- a/srcpkgs/ocaml/patches/ocaml-4.04.2-pie.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ocaml-4.04.2/asmcomp/emitaux.ml
-+++ ocaml-4.04.2/asmcomp/emitaux.ml
-@@ -205,6 +205,7 @@ let emit_frames a =
- | None -> a.efa_word 0
- end
- in
-+ a.efa_align Arch.size_addr;
- a.efa_word (List.length !frame_descriptors);
- List.iter emit_frame !frame_descriptors;
- Label_table.iter emit_debuginfo debuginfos;
---- ocaml-4.04.2/asmrun/power.S
-+++ ocaml-4.04.2/asmrun/power.S
-@@ -642,6 +642,7 @@ caml_system__code_end:
- /* Frame table */
-
- .section ".data"
-+ .align wordalign
- .globl caml_system__frametable
- .type caml_system__frametable, @object
- caml_system__frametable:
diff --git a/srcpkgs/ocaml/patches/ocaml-4.04.2-sigcontext.patch b/srcpkgs/ocaml/patches/ocaml-4.04.2-sigcontext.patch
deleted file mode 100644
index 9cad3403931..00000000000
--- a/srcpkgs/ocaml/patches/ocaml-4.04.2-sigcontext.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ocaml-4.04.2/asmrun/signals_osdep.h
-+++ ocaml-4.04.2/asmrun/signals_osdep.h
-@@ -297,11 +297,11 @@
- sigact.sa_flags = 0
-
- typedef unsigned long context_reg;
-- #define CONTEXT_PC (context->regs->nip)
-- #define CONTEXT_EXCEPTION_POINTER (context->regs->gpr[29])
-- #define CONTEXT_YOUNG_LIMIT (context->regs->gpr[30])
-- #define CONTEXT_YOUNG_PTR (context->regs->gpr[31])
-- #define CONTEXT_SP (context->regs->gpr[1])
-+ #define CONTEXT_PC (context->gp_regs[32])
-+ #define CONTEXT_EXCEPTION_POINTER (context->gp_regs[29])
-+ #define CONTEXT_YOUNG_LIMIT (context->gp_regs[30])
-+ #define CONTEXT_YOUNG_PTR (context->gp_regs[31])
-+ #define CONTEXT_SP (context->gp_regs[1])
-
- /****************** s390x, ELF (Linux) */
- #elif defined(TARGET_s390x) && defined(SYS_elf)
diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template
index 08cf3a232ca..382b8d417ee 100644
--- a/srcpkgs/ocaml/template
+++ b/srcpkgs/ocaml/template
@@ -1,21 +1,19 @@
# Template file for 'ocaml'
pkgname=ocaml
-version=4.07.1
+version=4.08.0
revision=1
+build_style="gnu-configure"
+configure_args="--with-pic"
makedepends="ncurses-devel libX11-devel"
-short_desc="The main implementation of the Caml language"
+short_desc="Main implementation of the Caml language"
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=83683ddad54bd23773591a9f757e702fa5cfa2ea1b124d8fe75a73729e592bfe
+checksum=c8ff78d010cb037ac6d6729e40ebdbee109218899007ef23a20b8f459ac186d6
nocross=yes
-disable_parallel_build=yes
patch_args="-Np1"
-do_configure() {
- ./configure -prefix /usr -mandir /usr/share/man -fPIC
-}
do_build() {
make ${makejobs} world.opt
}
From 2c785e6abb76d70c3711fbdb7d9adfd87cbb98b5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:33:12 +0200
Subject: [PATCH 2/7] ocamlbuild: rebuild for ocaml-4.08.0
---
srcpkgs/ocamlbuild/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ocamlbuild/template b/srcpkgs/ocamlbuild/template
index 539c01f9929..bb7d2201edd 100644
--- a/srcpkgs/ocamlbuild/template
+++ b/srcpkgs/ocamlbuild/template
@@ -1,8 +1,10 @@
# Template file for 'ocamlbuild'
pkgname=ocamlbuild
version=0.14.0
-revision=1
+revision=2
build_style=gnu-makefile
+make_build_args="PREFIX=/usr"
+make_install_args="PREFIX=/usr"
hostmakedepends="ocaml"
short_desc="OCaml build tool"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From 5cfd0250004a47f3bc9ef1db27a50a5769d5befd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:45:53 +0200
Subject: [PATCH 3/7] ocaml-findlib: rebuild for ocaml-4.08.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 bef5edb6170..519aa89bbab 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.7.3
-revision=3
+revision=5
build_style=configure
configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man"
make_build_args="all opt"
From e2a0fa9a812d2ef61b1de710a8209c1b6e881a9d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:49:57 +0200
Subject: [PATCH 4/7] ocaml-num: rebuild for ocaml-4.08.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 0aca785c495..8afe7d8ff40 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.1
-revision=4
+revision=5
build_style=gnu-makefile
makedepends="ocaml ocaml-findlib"
short_desc="OCaml legacy Num library for arbitrary-precision integers"
From bbddef383f8b16a8f76a6bdc986dee0198146bb3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:56:37 +0200
Subject: [PATCH 5/7] polygen: rebuild for ocaml-4.08.0
---
srcpkgs/polygen/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/polygen/template b/srcpkgs/polygen/template
index a7ceca1d687..7c5df93839c 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=3
+revision=4
build_style=gnu-makefile
build_wrksrc="src"
hostmakedepends="ocaml unzip"
From 620bbfefd113d9cf901d787e6a3b010e9a305d70 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:58:29 +0200
Subject: [PATCH 6/7] supermin: rebuild for ocaml-4.08.0
---
srcpkgs/supermin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supermin/template b/srcpkgs/supermin/template
index 6845ae9aff3..07fe80f46b3 100644
--- a/srcpkgs/supermin/template
+++ b/srcpkgs/supermin/template
@@ -1,7 +1,7 @@
# Template file for 'supermin'
pkgname=supermin
version=5.1.20
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="ocaml ocaml-findlib pkg-config e2fsprogs cpio perl"
makedepends="e2fsprogs-devel"
From 208fa412eb0372e2d66db6b94709b02cdd3018a6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 11:04:19 +0200
Subject: [PATCH 7/7] z3: rebuild for ocaml-4.08.0
---
srcpkgs/z3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index f4f7af3a8f9..ccd40cf932f 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,7 +1,7 @@
# Template file for 'z3'
pkgname=z3
version=4.8.5
-revision=1
+revision=2
wrksrc="${pkgname}-Z3-${version}"
build_style=configure
configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [WIP] OCaml 4.08
2019-06-14 9:14 [PR PATCH] [WIP] OCaml 4.08 voidlinux-github
@ 2019-06-14 9:16 ` voidlinux-github
2019-06-14 9:20 ` voidlinux-github
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: voidlinux-github @ 2019-06-14 9:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 213 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/12451#issuecomment-502035468
Comment:
Away from home rn, will look at fixing them after the weekend when I get back
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [WIP] OCaml 4.08
2019-06-14 9:14 [PR PATCH] [WIP] OCaml 4.08 voidlinux-github
2019-06-14 9:16 ` voidlinux-github
@ 2019-06-14 9:20 ` voidlinux-github
2019-06-21 0:22 ` voidlinux-github
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: voidlinux-github @ 2019-06-14 9:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 242 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/12451#issuecomment-502036905
Comment:
No hurries, we'll have to wait for a bunch of other upstream releases before we can merge this.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [WIP] OCaml 4.08
2019-06-14 9:14 [PR PATCH] [WIP] OCaml 4.08 voidlinux-github
2019-06-14 9:16 ` voidlinux-github
2019-06-14 9:20 ` voidlinux-github
@ 2019-06-21 0:22 ` voidlinux-github
2019-06-21 10:36 ` [PR PATCH] [Updated] " voidlinux-github
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: voidlinux-github @ 2019-06-21 0:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 209 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/12451#issuecomment-504244251
Comment:
Here's updated patches https://ftp.octaforge.org/q66/random/ocamlpatches/
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] OCaml 4.08
2019-06-14 9:14 [PR PATCH] [WIP] OCaml 4.08 voidlinux-github
` (2 preceding siblings ...)
2019-06-21 0:22 ` voidlinux-github
@ 2019-06-21 10:36 ` voidlinux-github
2019-06-21 10:36 ` voidlinux-github
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: voidlinux-github @ 2019-06-21 10:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 535 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages ocaml408
https://github.com/void-linux/void-packages/pull/12451
[WIP] OCaml 4.08
Missing/broken:
- [ ] ELFv2 patches for ppc64 (@q66)
- [ ] verifast
- [ ] coq
- [ ] mldonkey
- [ ] wyrd
- [ ] ocaml-lablgtk2
- [ ] unison
- [ ] pfff
- [ ] coccinelle
- [ ] camlp5
- [ ] camlp4
- [ ] opam
A patch file from https://github.com/void-linux/void-packages/pull/12451.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ocaml408-12451.patch --]
[-- Type: application/text/x-diff, Size: 11605 bytes --]
From df0460bce8d0365b3d1ff205e233ed11eef62219 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:32:28 +0200
Subject: [PATCH 1/7] ocaml: update to 4.08.0.
---
...v2.patch => ocaml-4.08.0-elfv2-ppc64.patch} | 18 +++++++++---------
....2-pie.patch => ocaml-4.08.0-ppc-pie.patch} | 10 +++++-----
... => ocaml-4.08.0-ppc-sigcontext-musl.patch} | 8 ++++----
srcpkgs/ocaml/template | 14 +++++++-------
srcpkgs/swi-prolog/template | 6 +++---
srcpkgs/xchm/template | 4 ++--
6 files changed, 30 insertions(+), 30 deletions(-)
rename srcpkgs/ocaml/patches/{ocaml-4.04.2-elfv2.patch => ocaml-4.08.0-elfv2-ppc64.patch} (93%)
rename srcpkgs/ocaml/patches/{ocaml-4.04.2-pie.patch => ocaml-4.08.0-ppc-pie.patch} (71%)
rename srcpkgs/ocaml/patches/{ocaml-4.04.2-sigcontext.patch => ocaml-4.08.0-ppc-sigcontext-musl.patch} (77%)
diff --git a/srcpkgs/ocaml/patches/ocaml-4.04.2-elfv2.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-elfv2-ppc64.patch
similarity index 93%
rename from srcpkgs/ocaml/patches/ocaml-4.04.2-elfv2.patch
rename to srcpkgs/ocaml/patches/ocaml-4.08.0-elfv2-ppc64.patch
index d1d195765ca..144a555322a 100644
--- a/srcpkgs/ocaml/patches/ocaml-4.04.2-elfv2.patch
+++ b/srcpkgs/ocaml/patches/ocaml-4.08.0-elfv2-ppc64.patch
@@ -1,5 +1,5 @@
---- ocaml-4.04.2/asmcomp/power/arch.ml
-+++ ocaml-4.04.2/asmcomp/power/arch.ml
+--- ocaml-4.08.0/asmcomp/power/arch.ml
++++ ocaml-4.08.0/asmcomp/power/arch.ml
@@ -28,7 +28,7 @@ type abi = ELF32 | ELF64v1 | ELF64v2
let abi =
match Config.model with
@@ -9,8 +9,8 @@
| "ppc64le" -> ELF64v2
| _ -> assert false
---- ocaml-4.04.2/asmrun/power.S
-+++ ocaml-4.04.2/asmrun/power.S
+--- ocaml-4.08.0/runtime/power.S
++++ ocaml-4.08.0/runtime/power.S
@@ -13,7 +13,7 @@
/* */
/**************************************************************************/
@@ -114,8 +114,8 @@
.section ".opd","aw"
#else
.section ".text"
---- ocaml-4.04.2/testsuite/tests/asmgen/power.S
-+++ ocaml-4.04.2/testsuite/tests/asmgen/power.S
+--- ocaml-4.08.0/testsuite/tools/asmgen_power.S
++++ ocaml-4.08.0/testsuite/tools/asmgen_power.S
@@ -25,12 +25,10 @@
#if defined(MODEL_ppc)
#define RESERVED_STACK 16
@@ -181,9 +181,9 @@
mtctr 28
mr 12, 28
#else
---- ocaml-4.04.2/byterun/caml/stack.h
-+++ ocaml-4.04.2/byterun/caml/stack.h
-@@ -40,10 +40,10 @@
+--- ocaml-4.08.0/runtime/caml/stack.h
++++ ocaml-4.08.0/runtime/caml/stack.h
+@@ -35,10 +35,10 @@
#if defined(MODEL_ppc)
#define Saved_return_address(sp) *((intnat *)((sp) - 4))
#define Callback_link(sp) ((struct caml_context *)((sp) + 16))
diff --git a/srcpkgs/ocaml/patches/ocaml-4.04.2-pie.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
similarity index 71%
rename from srcpkgs/ocaml/patches/ocaml-4.04.2-pie.patch
rename to srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
index 6aed5844d33..138f8185f85 100644
--- a/srcpkgs/ocaml/patches/ocaml-4.04.2-pie.patch
+++ b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
@@ -1,6 +1,6 @@
---- ocaml-4.04.2/asmcomp/emitaux.ml
-+++ ocaml-4.04.2/asmcomp/emitaux.ml
-@@ -205,6 +205,7 @@ let emit_frames a =
+--- 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
@@ -8,8 +8,8 @@
a.efa_word (List.length !frame_descriptors);
List.iter emit_frame !frame_descriptors;
Label_table.iter emit_debuginfo debuginfos;
---- ocaml-4.04.2/asmrun/power.S
-+++ ocaml-4.04.2/asmrun/power.S
+--- ocaml-4.08.0/runtime/power.S
++++ ocaml-4.08.0/runtime/power.S
@@ -642,6 +642,7 @@ caml_system__code_end:
/* Frame table */
diff --git a/srcpkgs/ocaml/patches/ocaml-4.04.2-sigcontext.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-sigcontext-musl.patch
similarity index 77%
rename from srcpkgs/ocaml/patches/ocaml-4.04.2-sigcontext.patch
rename to srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-sigcontext-musl.patch
index 9cad3403931..a40bc5fd64d 100644
--- a/srcpkgs/ocaml/patches/ocaml-4.04.2-sigcontext.patch
+++ b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-sigcontext-musl.patch
@@ -1,5 +1,5 @@
---- ocaml-4.04.2/asmrun/signals_osdep.h
-+++ ocaml-4.04.2/asmrun/signals_osdep.h
+--- ocaml-4.04.2/runtime/signals_osdep.h
++++ ocaml-4.04.2/runtime/signals_osdep.h
@@ -297,11 +297,11 @@
sigact.sa_flags = 0
@@ -15,5 +15,5 @@
+ #define CONTEXT_YOUNG_PTR (context->gp_regs[31])
+ #define CONTEXT_SP (context->gp_regs[1])
- /****************** s390x, ELF (Linux) */
- #elif defined(TARGET_s390x) && defined(SYS_elf)
+ /****************** PowerPC, NetBSD */
+
diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template
index 08cf3a232ca..d88459b493d 100644
--- a/srcpkgs/ocaml/template
+++ b/srcpkgs/ocaml/template
@@ -1,21 +1,21 @@
# Template file for 'ocaml'
pkgname=ocaml
-version=4.07.1
+version=4.08.0
revision=1
+build_style="gnu-configure"
+configure_args="--with-pic"
makedepends="ncurses-devel libX11-devel"
-short_desc="The main implementation of the Caml language"
+short_desc="Main implementation of the Caml language"
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=83683ddad54bd23773591a9f757e702fa5cfa2ea1b124d8fe75a73729e592bfe
+checksum=c8ff78d010cb037ac6d6729e40ebdbee109218899007ef23a20b8f459ac186d6
nocross=yes
-disable_parallel_build=yes
patch_args="-Np1"
-do_configure() {
- ./configure -prefix /usr -mandir /usr/share/man -fPIC
-}
+export ASPP="cc -c"
+
do_build() {
make ${makejobs} world.opt
}
diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index 98218151081..3f410aa1a5b 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,7 +1,7 @@
# Template file for 'swi-prolog'
pkgname=swi-prolog
-version=8.0.2
-revision=2
+version=8.0.3
+revision=1
wrksrc="swipl-${version}"
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
homepage="http://www.swi-prolog.org/"
changelog="http://www.swi-prolog.org/ChangeLog?branch=stable"
distfiles="http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz"
-checksum=abb81b55ac5f2c90997c0005b1f15b74ed046638b64e784840a139fe21d0a735
+checksum=cee59c0a477c8166d722703f6e52f962028f3ac43a5f41240ecb45dbdbe2d6ae
case "$XBPS_TARGET_MACHINE" in
armv*) broken="https://travis-ci.org/void-linux/void-packages/jobs/510224384";;
diff --git a/srcpkgs/xchm/template b/srcpkgs/xchm/template
index 83c9fa3ab72..0aab957949f 100644
--- a/srcpkgs/xchm/template
+++ b/srcpkgs/xchm/template
@@ -1,6 +1,6 @@
# Template file for 'xchm'
pkgname=xchm
-version=1.29
+version=1.30
revision=1
build_style=gnu-configure
configure_args="--with-wx-config=wx-config-gtk3"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/rzvncj/xCHM"
distfiles="https://github.com/rzvncj/xCHM/releases/download/${version}/xchm-${version}.tar.gz"
-checksum=cea900cf4252c7f2f6736e48a4f639b0bad00fdce249aa55ebb6a44dcf976b0a
+checksum=85a98f2a40d53fb43a49dfe91f0854cd511033271b3a9c45f0a5d77bc7e2c5a0
pre_configure() {
autoreconf -fi
From a6febd669c8e85989e1418a065f96e3fdf42939c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:33:12 +0200
Subject: [PATCH 2/7] ocamlbuild: rebuild for ocaml-4.08.0
---
srcpkgs/ocamlbuild/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ocamlbuild/template b/srcpkgs/ocamlbuild/template
index 539c01f9929..bb7d2201edd 100644
--- a/srcpkgs/ocamlbuild/template
+++ b/srcpkgs/ocamlbuild/template
@@ -1,8 +1,10 @@
# Template file for 'ocamlbuild'
pkgname=ocamlbuild
version=0.14.0
-revision=1
+revision=2
build_style=gnu-makefile
+make_build_args="PREFIX=/usr"
+make_install_args="PREFIX=/usr"
hostmakedepends="ocaml"
short_desc="OCaml build tool"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From 3c05d1e7a22f5b3ca529eac8f8b2dcc83ac5b16a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:45:53 +0200
Subject: [PATCH 3/7] ocaml-findlib: rebuild for ocaml-4.08.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 bef5edb6170..519aa89bbab 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.7.3
-revision=3
+revision=5
build_style=configure
configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man"
make_build_args="all opt"
From f05da271e6e6ac4ac269f57bec571c10c6cdbc7a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:49:57 +0200
Subject: [PATCH 4/7] ocaml-num: rebuild for ocaml-4.08.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 0aca785c495..8afe7d8ff40 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.1
-revision=4
+revision=5
build_style=gnu-makefile
makedepends="ocaml ocaml-findlib"
short_desc="OCaml legacy Num library for arbitrary-precision integers"
From 907b370ae82bf24b832f9cfa58dc6deea5fee671 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:56:37 +0200
Subject: [PATCH 5/7] polygen: rebuild for ocaml-4.08.0
---
srcpkgs/polygen/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/polygen/template b/srcpkgs/polygen/template
index a7ceca1d687..7c5df93839c 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=3
+revision=4
build_style=gnu-makefile
build_wrksrc="src"
hostmakedepends="ocaml unzip"
From 4630e7eeac0cc17989c471a18556e4b6862d2086 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:58:29 +0200
Subject: [PATCH 6/7] supermin: rebuild for ocaml-4.08.0
---
srcpkgs/supermin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supermin/template b/srcpkgs/supermin/template
index 6845ae9aff3..07fe80f46b3 100644
--- a/srcpkgs/supermin/template
+++ b/srcpkgs/supermin/template
@@ -1,7 +1,7 @@
# Template file for 'supermin'
pkgname=supermin
version=5.1.20
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="ocaml ocaml-findlib pkg-config e2fsprogs cpio perl"
makedepends="e2fsprogs-devel"
From 243f402b4b650445332550add4e2da78f3ac4170 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 11:04:19 +0200
Subject: [PATCH 7/7] z3: rebuild for ocaml-4.08.0
---
srcpkgs/z3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index f4f7af3a8f9..ccd40cf932f 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,7 +1,7 @@
# Template file for 'z3'
pkgname=z3
version=4.8.5
-revision=1
+revision=2
wrksrc="${pkgname}-Z3-${version}"
build_style=configure
configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] OCaml 4.08
2019-06-14 9:14 [PR PATCH] [WIP] OCaml 4.08 voidlinux-github
` (3 preceding siblings ...)
2019-06-21 10:36 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-06-21 10:36 ` voidlinux-github
2019-07-12 16:07 ` [PR PATCH] [Closed]: " voidlinux-github
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: voidlinux-github @ 2019-06-21 10:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 535 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages ocaml408
https://github.com/void-linux/void-packages/pull/12451
[WIP] OCaml 4.08
Missing/broken:
- [ ] ELFv2 patches for ppc64 (@q66)
- [ ] verifast
- [ ] coq
- [ ] mldonkey
- [ ] wyrd
- [ ] ocaml-lablgtk2
- [ ] unison
- [ ] pfff
- [ ] coccinelle
- [ ] camlp5
- [ ] camlp4
- [ ] opam
A patch file from https://github.com/void-linux/void-packages/pull/12451.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ocaml408-12451.patch --]
[-- Type: application/text/x-diff, Size: 11605 bytes --]
From df0460bce8d0365b3d1ff205e233ed11eef62219 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:32:28 +0200
Subject: [PATCH 1/7] ocaml: update to 4.08.0.
---
...v2.patch => ocaml-4.08.0-elfv2-ppc64.patch} | 18 +++++++++---------
....2-pie.patch => ocaml-4.08.0-ppc-pie.patch} | 10 +++++-----
... => ocaml-4.08.0-ppc-sigcontext-musl.patch} | 8 ++++----
srcpkgs/ocaml/template | 14 +++++++-------
srcpkgs/swi-prolog/template | 6 +++---
srcpkgs/xchm/template | 4 ++--
6 files changed, 30 insertions(+), 30 deletions(-)
rename srcpkgs/ocaml/patches/{ocaml-4.04.2-elfv2.patch => ocaml-4.08.0-elfv2-ppc64.patch} (93%)
rename srcpkgs/ocaml/patches/{ocaml-4.04.2-pie.patch => ocaml-4.08.0-ppc-pie.patch} (71%)
rename srcpkgs/ocaml/patches/{ocaml-4.04.2-sigcontext.patch => ocaml-4.08.0-ppc-sigcontext-musl.patch} (77%)
diff --git a/srcpkgs/ocaml/patches/ocaml-4.04.2-elfv2.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-elfv2-ppc64.patch
similarity index 93%
rename from srcpkgs/ocaml/patches/ocaml-4.04.2-elfv2.patch
rename to srcpkgs/ocaml/patches/ocaml-4.08.0-elfv2-ppc64.patch
index d1d195765ca..144a555322a 100644
--- a/srcpkgs/ocaml/patches/ocaml-4.04.2-elfv2.patch
+++ b/srcpkgs/ocaml/patches/ocaml-4.08.0-elfv2-ppc64.patch
@@ -1,5 +1,5 @@
---- ocaml-4.04.2/asmcomp/power/arch.ml
-+++ ocaml-4.04.2/asmcomp/power/arch.ml
+--- ocaml-4.08.0/asmcomp/power/arch.ml
++++ ocaml-4.08.0/asmcomp/power/arch.ml
@@ -28,7 +28,7 @@ type abi = ELF32 | ELF64v1 | ELF64v2
let abi =
match Config.model with
@@ -9,8 +9,8 @@
| "ppc64le" -> ELF64v2
| _ -> assert false
---- ocaml-4.04.2/asmrun/power.S
-+++ ocaml-4.04.2/asmrun/power.S
+--- ocaml-4.08.0/runtime/power.S
++++ ocaml-4.08.0/runtime/power.S
@@ -13,7 +13,7 @@
/* */
/**************************************************************************/
@@ -114,8 +114,8 @@
.section ".opd","aw"
#else
.section ".text"
---- ocaml-4.04.2/testsuite/tests/asmgen/power.S
-+++ ocaml-4.04.2/testsuite/tests/asmgen/power.S
+--- ocaml-4.08.0/testsuite/tools/asmgen_power.S
++++ ocaml-4.08.0/testsuite/tools/asmgen_power.S
@@ -25,12 +25,10 @@
#if defined(MODEL_ppc)
#define RESERVED_STACK 16
@@ -181,9 +181,9 @@
mtctr 28
mr 12, 28
#else
---- ocaml-4.04.2/byterun/caml/stack.h
-+++ ocaml-4.04.2/byterun/caml/stack.h
-@@ -40,10 +40,10 @@
+--- ocaml-4.08.0/runtime/caml/stack.h
++++ ocaml-4.08.0/runtime/caml/stack.h
+@@ -35,10 +35,10 @@
#if defined(MODEL_ppc)
#define Saved_return_address(sp) *((intnat *)((sp) - 4))
#define Callback_link(sp) ((struct caml_context *)((sp) + 16))
diff --git a/srcpkgs/ocaml/patches/ocaml-4.04.2-pie.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
similarity index 71%
rename from srcpkgs/ocaml/patches/ocaml-4.04.2-pie.patch
rename to srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
index 6aed5844d33..138f8185f85 100644
--- a/srcpkgs/ocaml/patches/ocaml-4.04.2-pie.patch
+++ b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
@@ -1,6 +1,6 @@
---- ocaml-4.04.2/asmcomp/emitaux.ml
-+++ ocaml-4.04.2/asmcomp/emitaux.ml
-@@ -205,6 +205,7 @@ let emit_frames a =
+--- 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
@@ -8,8 +8,8 @@
a.efa_word (List.length !frame_descriptors);
List.iter emit_frame !frame_descriptors;
Label_table.iter emit_debuginfo debuginfos;
---- ocaml-4.04.2/asmrun/power.S
-+++ ocaml-4.04.2/asmrun/power.S
+--- ocaml-4.08.0/runtime/power.S
++++ ocaml-4.08.0/runtime/power.S
@@ -642,6 +642,7 @@ caml_system__code_end:
/* Frame table */
diff --git a/srcpkgs/ocaml/patches/ocaml-4.04.2-sigcontext.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-sigcontext-musl.patch
similarity index 77%
rename from srcpkgs/ocaml/patches/ocaml-4.04.2-sigcontext.patch
rename to srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-sigcontext-musl.patch
index 9cad3403931..a40bc5fd64d 100644
--- a/srcpkgs/ocaml/patches/ocaml-4.04.2-sigcontext.patch
+++ b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-sigcontext-musl.patch
@@ -1,5 +1,5 @@
---- ocaml-4.04.2/asmrun/signals_osdep.h
-+++ ocaml-4.04.2/asmrun/signals_osdep.h
+--- ocaml-4.04.2/runtime/signals_osdep.h
++++ ocaml-4.04.2/runtime/signals_osdep.h
@@ -297,11 +297,11 @@
sigact.sa_flags = 0
@@ -15,5 +15,5 @@
+ #define CONTEXT_YOUNG_PTR (context->gp_regs[31])
+ #define CONTEXT_SP (context->gp_regs[1])
- /****************** s390x, ELF (Linux) */
- #elif defined(TARGET_s390x) && defined(SYS_elf)
+ /****************** PowerPC, NetBSD */
+
diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template
index 08cf3a232ca..d88459b493d 100644
--- a/srcpkgs/ocaml/template
+++ b/srcpkgs/ocaml/template
@@ -1,21 +1,21 @@
# Template file for 'ocaml'
pkgname=ocaml
-version=4.07.1
+version=4.08.0
revision=1
+build_style="gnu-configure"
+configure_args="--with-pic"
makedepends="ncurses-devel libX11-devel"
-short_desc="The main implementation of the Caml language"
+short_desc="Main implementation of the Caml language"
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=83683ddad54bd23773591a9f757e702fa5cfa2ea1b124d8fe75a73729e592bfe
+checksum=c8ff78d010cb037ac6d6729e40ebdbee109218899007ef23a20b8f459ac186d6
nocross=yes
-disable_parallel_build=yes
patch_args="-Np1"
-do_configure() {
- ./configure -prefix /usr -mandir /usr/share/man -fPIC
-}
+export ASPP="cc -c"
+
do_build() {
make ${makejobs} world.opt
}
diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index 98218151081..3f410aa1a5b 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,7 +1,7 @@
# Template file for 'swi-prolog'
pkgname=swi-prolog
-version=8.0.2
-revision=2
+version=8.0.3
+revision=1
wrksrc="swipl-${version}"
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
homepage="http://www.swi-prolog.org/"
changelog="http://www.swi-prolog.org/ChangeLog?branch=stable"
distfiles="http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz"
-checksum=abb81b55ac5f2c90997c0005b1f15b74ed046638b64e784840a139fe21d0a735
+checksum=cee59c0a477c8166d722703f6e52f962028f3ac43a5f41240ecb45dbdbe2d6ae
case "$XBPS_TARGET_MACHINE" in
armv*) broken="https://travis-ci.org/void-linux/void-packages/jobs/510224384";;
diff --git a/srcpkgs/xchm/template b/srcpkgs/xchm/template
index 83c9fa3ab72..0aab957949f 100644
--- a/srcpkgs/xchm/template
+++ b/srcpkgs/xchm/template
@@ -1,6 +1,6 @@
# Template file for 'xchm'
pkgname=xchm
-version=1.29
+version=1.30
revision=1
build_style=gnu-configure
configure_args="--with-wx-config=wx-config-gtk3"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/rzvncj/xCHM"
distfiles="https://github.com/rzvncj/xCHM/releases/download/${version}/xchm-${version}.tar.gz"
-checksum=cea900cf4252c7f2f6736e48a4f639b0bad00fdce249aa55ebb6a44dcf976b0a
+checksum=85a98f2a40d53fb43a49dfe91f0854cd511033271b3a9c45f0a5d77bc7e2c5a0
pre_configure() {
autoreconf -fi
From a6febd669c8e85989e1418a065f96e3fdf42939c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:33:12 +0200
Subject: [PATCH 2/7] ocamlbuild: rebuild for ocaml-4.08.0
---
srcpkgs/ocamlbuild/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ocamlbuild/template b/srcpkgs/ocamlbuild/template
index 539c01f9929..bb7d2201edd 100644
--- a/srcpkgs/ocamlbuild/template
+++ b/srcpkgs/ocamlbuild/template
@@ -1,8 +1,10 @@
# Template file for 'ocamlbuild'
pkgname=ocamlbuild
version=0.14.0
-revision=1
+revision=2
build_style=gnu-makefile
+make_build_args="PREFIX=/usr"
+make_install_args="PREFIX=/usr"
hostmakedepends="ocaml"
short_desc="OCaml build tool"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From 3c05d1e7a22f5b3ca529eac8f8b2dcc83ac5b16a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:45:53 +0200
Subject: [PATCH 3/7] ocaml-findlib: rebuild for ocaml-4.08.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 bef5edb6170..519aa89bbab 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.7.3
-revision=3
+revision=5
build_style=configure
configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man"
make_build_args="all opt"
From f05da271e6e6ac4ac269f57bec571c10c6cdbc7a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:49:57 +0200
Subject: [PATCH 4/7] ocaml-num: rebuild for ocaml-4.08.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 0aca785c495..8afe7d8ff40 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.1
-revision=4
+revision=5
build_style=gnu-makefile
makedepends="ocaml ocaml-findlib"
short_desc="OCaml legacy Num library for arbitrary-precision integers"
From 907b370ae82bf24b832f9cfa58dc6deea5fee671 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:56:37 +0200
Subject: [PATCH 5/7] polygen: rebuild for ocaml-4.08.0
---
srcpkgs/polygen/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/polygen/template b/srcpkgs/polygen/template
index a7ceca1d687..7c5df93839c 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=3
+revision=4
build_style=gnu-makefile
build_wrksrc="src"
hostmakedepends="ocaml unzip"
From 4630e7eeac0cc17989c471a18556e4b6862d2086 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:58:29 +0200
Subject: [PATCH 6/7] supermin: rebuild for ocaml-4.08.0
---
srcpkgs/supermin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supermin/template b/srcpkgs/supermin/template
index 6845ae9aff3..07fe80f46b3 100644
--- a/srcpkgs/supermin/template
+++ b/srcpkgs/supermin/template
@@ -1,7 +1,7 @@
# Template file for 'supermin'
pkgname=supermin
version=5.1.20
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="ocaml ocaml-findlib pkg-config e2fsprogs cpio perl"
makedepends="e2fsprogs-devel"
From 243f402b4b650445332550add4e2da78f3ac4170 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 11:04:19 +0200
Subject: [PATCH 7/7] z3: rebuild for ocaml-4.08.0
---
srcpkgs/z3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index f4f7af3a8f9..ccd40cf932f 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,7 +1,7 @@
# Template file for 'z3'
pkgname=z3
version=4.8.5
-revision=1
+revision=2
wrksrc="${pkgname}-Z3-${version}"
build_style=configure
configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Closed]: [WIP] OCaml 4.08
2019-06-14 9:14 [PR PATCH] [WIP] OCaml 4.08 voidlinux-github
` (4 preceding siblings ...)
2019-06-21 10:36 ` voidlinux-github
@ 2019-07-12 16:07 ` voidlinux-github
2019-07-12 16:07 ` [PR PATCH] [Updated] " voidlinux-github
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: voidlinux-github @ 2019-07-12 16:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 363 bytes --]
There's a closed pull request on the void-packages repository
[WIP] OCaml 4.08
https://github.com/void-linux/void-packages/pull/12451
Description: Missing/broken:
- [ ] ELFv2 patches for ppc64 (@q66)
- [ ] verifast
- [ ] coq
- [ ] mldonkey
- [ ] wyrd
- [ ] ocaml-lablgtk2
- [ ] unison
- [ ] pfff
- [ ] coccinelle
- [ ] camlp5
- [ ] camlp4
- [ ] opam
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] OCaml 4.08
2019-06-14 9:14 [PR PATCH] [WIP] OCaml 4.08 voidlinux-github
` (5 preceding siblings ...)
2019-07-12 16:07 ` [PR PATCH] [Closed]: " voidlinux-github
@ 2019-07-12 16:07 ` voidlinux-github
2019-07-12 16:08 ` voidlinux-github
2019-07-12 16:08 ` voidlinux-github
8 siblings, 0 replies; 10+ messages in thread
From: voidlinux-github @ 2019-07-12 16:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 535 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages ocaml408
https://github.com/void-linux/void-packages/pull/12451
[WIP] OCaml 4.08
Missing/broken:
- [ ] ELFv2 patches for ppc64 (@q66)
- [ ] verifast
- [ ] coq
- [ ] mldonkey
- [ ] wyrd
- [ ] ocaml-lablgtk2
- [ ] unison
- [ ] pfff
- [ ] coccinelle
- [ ] camlp5
- [ ] camlp4
- [ ] opam
A patch file from https://github.com/void-linux/void-packages/pull/12451.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ocaml408-12451.patch --]
[-- Type: application/text/x-diff, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] OCaml 4.08
2019-06-14 9:14 [PR PATCH] [WIP] OCaml 4.08 voidlinux-github
` (6 preceding siblings ...)
2019-07-12 16:07 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-07-12 16:08 ` voidlinux-github
2019-07-12 16:08 ` voidlinux-github
8 siblings, 0 replies; 10+ messages in thread
From: voidlinux-github @ 2019-07-12 16:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 535 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages ocaml408
https://github.com/void-linux/void-packages/pull/12451
[WIP] OCaml 4.08
Missing/broken:
- [ ] ELFv2 patches for ppc64 (@q66)
- [ ] verifast
- [ ] coq
- [ ] mldonkey
- [ ] wyrd
- [ ] ocaml-lablgtk2
- [ ] unison
- [ ] pfff
- [ ] coccinelle
- [ ] camlp5
- [ ] camlp4
- [ ] opam
A patch file from https://github.com/void-linux/void-packages/pull/12451.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ocaml408-12451.patch --]
[-- Type: application/text/x-diff, Size: 10949 bytes --]
From b5a4f5743f8b615fdcb918cc608ea5a36e90c095 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:32:28 +0200
Subject: [PATCH 1/8] ocaml: update to 4.08.0.
---
...2.patch => ocaml-4.08.0-elfv2-ppc64.patch} | 18 ++++++++--------
...2-pie.patch => ocaml-4.08.0-ppc-pie.patch} | 10 ++++-----
...=> ocaml-4.08.0-ppc-sigcontext-musl.patch} | 8 +++----
srcpkgs/ocaml/template | 21 ++++++++-----------
4 files changed, 27 insertions(+), 30 deletions(-)
rename srcpkgs/ocaml/patches/{ocaml-4.04.2-elfv2.patch => ocaml-4.08.0-elfv2-ppc64.patch} (93%)
rename srcpkgs/ocaml/patches/{ocaml-4.04.2-pie.patch => ocaml-4.08.0-ppc-pie.patch} (71%)
rename srcpkgs/ocaml/patches/{ocaml-4.04.2-sigcontext.patch => ocaml-4.08.0-ppc-sigcontext-musl.patch} (77%)
diff --git a/srcpkgs/ocaml/patches/ocaml-4.04.2-elfv2.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-elfv2-ppc64.patch
similarity index 93%
rename from srcpkgs/ocaml/patches/ocaml-4.04.2-elfv2.patch
rename to srcpkgs/ocaml/patches/ocaml-4.08.0-elfv2-ppc64.patch
index d1d195765ca..144a555322a 100644
--- a/srcpkgs/ocaml/patches/ocaml-4.04.2-elfv2.patch
+++ b/srcpkgs/ocaml/patches/ocaml-4.08.0-elfv2-ppc64.patch
@@ -1,5 +1,5 @@
---- ocaml-4.04.2/asmcomp/power/arch.ml
-+++ ocaml-4.04.2/asmcomp/power/arch.ml
+--- ocaml-4.08.0/asmcomp/power/arch.ml
++++ ocaml-4.08.0/asmcomp/power/arch.ml
@@ -28,7 +28,7 @@ type abi = ELF32 | ELF64v1 | ELF64v2
let abi =
match Config.model with
@@ -9,8 +9,8 @@
| "ppc64le" -> ELF64v2
| _ -> assert false
---- ocaml-4.04.2/asmrun/power.S
-+++ ocaml-4.04.2/asmrun/power.S
+--- ocaml-4.08.0/runtime/power.S
++++ ocaml-4.08.0/runtime/power.S
@@ -13,7 +13,7 @@
/* */
/**************************************************************************/
@@ -114,8 +114,8 @@
.section ".opd","aw"
#else
.section ".text"
---- ocaml-4.04.2/testsuite/tests/asmgen/power.S
-+++ ocaml-4.04.2/testsuite/tests/asmgen/power.S
+--- ocaml-4.08.0/testsuite/tools/asmgen_power.S
++++ ocaml-4.08.0/testsuite/tools/asmgen_power.S
@@ -25,12 +25,10 @@
#if defined(MODEL_ppc)
#define RESERVED_STACK 16
@@ -181,9 +181,9 @@
mtctr 28
mr 12, 28
#else
---- ocaml-4.04.2/byterun/caml/stack.h
-+++ ocaml-4.04.2/byterun/caml/stack.h
-@@ -40,10 +40,10 @@
+--- ocaml-4.08.0/runtime/caml/stack.h
++++ ocaml-4.08.0/runtime/caml/stack.h
+@@ -35,10 +35,10 @@
#if defined(MODEL_ppc)
#define Saved_return_address(sp) *((intnat *)((sp) - 4))
#define Callback_link(sp) ((struct caml_context *)((sp) + 16))
diff --git a/srcpkgs/ocaml/patches/ocaml-4.04.2-pie.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
similarity index 71%
rename from srcpkgs/ocaml/patches/ocaml-4.04.2-pie.patch
rename to srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
index 6aed5844d33..138f8185f85 100644
--- a/srcpkgs/ocaml/patches/ocaml-4.04.2-pie.patch
+++ b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
@@ -1,6 +1,6 @@
---- ocaml-4.04.2/asmcomp/emitaux.ml
-+++ ocaml-4.04.2/asmcomp/emitaux.ml
-@@ -205,6 +205,7 @@ let emit_frames a =
+--- 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
@@ -8,8 +8,8 @@
a.efa_word (List.length !frame_descriptors);
List.iter emit_frame !frame_descriptors;
Label_table.iter emit_debuginfo debuginfos;
---- ocaml-4.04.2/asmrun/power.S
-+++ ocaml-4.04.2/asmrun/power.S
+--- ocaml-4.08.0/runtime/power.S
++++ ocaml-4.08.0/runtime/power.S
@@ -642,6 +642,7 @@ caml_system__code_end:
/* Frame table */
diff --git a/srcpkgs/ocaml/patches/ocaml-4.04.2-sigcontext.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-sigcontext-musl.patch
similarity index 77%
rename from srcpkgs/ocaml/patches/ocaml-4.04.2-sigcontext.patch
rename to srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-sigcontext-musl.patch
index 9cad3403931..a40bc5fd64d 100644
--- a/srcpkgs/ocaml/patches/ocaml-4.04.2-sigcontext.patch
+++ b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-sigcontext-musl.patch
@@ -1,5 +1,5 @@
---- ocaml-4.04.2/asmrun/signals_osdep.h
-+++ ocaml-4.04.2/asmrun/signals_osdep.h
+--- ocaml-4.04.2/runtime/signals_osdep.h
++++ ocaml-4.04.2/runtime/signals_osdep.h
@@ -297,11 +297,11 @@
sigact.sa_flags = 0
@@ -15,5 +15,5 @@
+ #define CONTEXT_YOUNG_PTR (context->gp_regs[31])
+ #define CONTEXT_SP (context->gp_regs[1])
- /****************** s390x, ELF (Linux) */
- #elif defined(TARGET_s390x) && defined(SYS_elf)
+ /****************** PowerPC, NetBSD */
+
diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template
index 08cf3a232ca..e2768d23e89 100644
--- a/srcpkgs/ocaml/template
+++ b/srcpkgs/ocaml/template
@@ -1,25 +1,22 @@
# Template file for 'ocaml'
pkgname=ocaml
-version=4.07.1
+version=4.08.0
revision=1
+build_style="gnu-configure"
+configure_args="--with-pic"
+make_build_target="world.opt"
makedepends="ncurses-devel libX11-devel"
-short_desc="The main implementation of the Caml language"
+short_desc="Main implementation of the Caml language"
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=83683ddad54bd23773591a9f757e702fa5cfa2ea1b124d8fe75a73729e592bfe
+checksum=c8ff78d010cb037ac6d6729e40ebdbee109218899007ef23a20b8f459ac186d6
nocross=yes
-disable_parallel_build=yes
patch_args="-Np1"
-do_configure() {
- ./configure -prefix /usr -mandir /usr/share/man -fPIC
-}
-do_build() {
- make ${makejobs} world.opt
-}
-do_install() {
- make PREFIX=${DESTDIR}/usr MANDIR=${DESTDIR}/usr/share/man install
+export ASPP="cc -c"
+
+post_install() {
vlicense LICENSE
}
From 2af5784582919e93f84926277a7d5b20123761ec Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:33:12 +0200
Subject: [PATCH 2/8] ocamlbuild: rebuild for ocaml-4.08.0
---
srcpkgs/ocamlbuild/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ocamlbuild/template b/srcpkgs/ocamlbuild/template
index 539c01f9929..bb7d2201edd 100644
--- a/srcpkgs/ocamlbuild/template
+++ b/srcpkgs/ocamlbuild/template
@@ -1,8 +1,10 @@
# Template file for 'ocamlbuild'
pkgname=ocamlbuild
version=0.14.0
-revision=1
+revision=2
build_style=gnu-makefile
+make_build_args="PREFIX=/usr"
+make_install_args="PREFIX=/usr"
hostmakedepends="ocaml"
short_desc="OCaml build tool"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From aa2f9ee47329bc9497018381764eae32510f9e6e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:45:53 +0200
Subject: [PATCH 3/8] ocaml-findlib: rebuild for ocaml-4.08.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 bef5edb6170..519aa89bbab 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.7.3
-revision=3
+revision=5
build_style=configure
configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man"
make_build_args="all opt"
From 261d4890e7cb5431b8818e7448edac32fe838dfa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:49:57 +0200
Subject: [PATCH 4/8] ocaml-num: rebuild for ocaml-4.08.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 86395a403df..bf5af4e7a68 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.2
-revision=1
+revision=2
build_style=gnu-makefile
makedepends="ocaml ocaml-findlib"
make_install_target="findlib-install"
From 6e87a3a4fe1f4380aad97d0dd4752d73845e8b53 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:56:37 +0200
Subject: [PATCH 5/8] polygen: rebuild for ocaml-4.08.0
---
srcpkgs/polygen/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/polygen/template b/srcpkgs/polygen/template
index a7ceca1d687..7c5df93839c 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=3
+revision=4
build_style=gnu-makefile
build_wrksrc="src"
hostmakedepends="ocaml unzip"
From 3f6afa082328d6277835b663628c8923eddab712 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:58:29 +0200
Subject: [PATCH 6/8] supermin: rebuild for ocaml-4.08.0
---
srcpkgs/supermin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supermin/template b/srcpkgs/supermin/template
index 6845ae9aff3..07fe80f46b3 100644
--- a/srcpkgs/supermin/template
+++ b/srcpkgs/supermin/template
@@ -1,7 +1,7 @@
# Template file for 'supermin'
pkgname=supermin
version=5.1.20
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="ocaml ocaml-findlib pkg-config e2fsprogs cpio perl"
makedepends="e2fsprogs-devel"
From e108da8d8847b05afd296cf8abe5d320d1dd771c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 11:04:19 +0200
Subject: [PATCH 7/8] z3: rebuild for ocaml-4.08.0
---
srcpkgs/z3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index f4f7af3a8f9..ccd40cf932f 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,7 +1,7 @@
# Template file for 'z3'
pkgname=z3
version=4.8.5
-revision=1
+revision=2
wrksrc="${pkgname}-Z3-${version}"
build_style=configure
configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"
From 9c0d1a5a9af3eef84ee6041b400c37bb028262b9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 12 Jul 2019 18:07:02 +0200
Subject: [PATCH 8/8] opam: update to 2.0.5.
---
srcpkgs/opam/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index 0c9cfaa38c0..efb8f38140b 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,6 +1,6 @@
# Template file for 'opam'
pkgname=opam
-version=2.0.4
+version=2.0.5
revision=1
build_style=gnu-configure
disable_parallel_build=yes
@@ -15,7 +15,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="LGPL-3.0-only"
homepage="http://opam.ocamlpro.com"
distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=956746e4556bfb40ea8e4f05ba5d61f44ed7e03bffddcaf567328290ba52a93c
+checksum=f07f3ea3d4507c8a43cddbd409869377c7878d330c3e8a668424287b989d4fb9
nocross=yes
post_install() {
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] OCaml 4.08
2019-06-14 9:14 [PR PATCH] [WIP] OCaml 4.08 voidlinux-github
` (7 preceding siblings ...)
2019-07-12 16:08 ` voidlinux-github
@ 2019-07-12 16:08 ` voidlinux-github
8 siblings, 0 replies; 10+ messages in thread
From: voidlinux-github @ 2019-07-12 16:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 535 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages ocaml408
https://github.com/void-linux/void-packages/pull/12451
[WIP] OCaml 4.08
Missing/broken:
- [ ] ELFv2 patches for ppc64 (@q66)
- [ ] verifast
- [ ] coq
- [ ] mldonkey
- [ ] wyrd
- [ ] ocaml-lablgtk2
- [ ] unison
- [ ] pfff
- [ ] coccinelle
- [ ] camlp5
- [ ] camlp4
- [ ] opam
A patch file from https://github.com/void-linux/void-packages/pull/12451.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ocaml408-12451.patch --]
[-- Type: application/text/x-diff, Size: 10949 bytes --]
From b5a4f5743f8b615fdcb918cc608ea5a36e90c095 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:32:28 +0200
Subject: [PATCH 1/8] ocaml: update to 4.08.0.
---
...2.patch => ocaml-4.08.0-elfv2-ppc64.patch} | 18 ++++++++--------
...2-pie.patch => ocaml-4.08.0-ppc-pie.patch} | 10 ++++-----
...=> ocaml-4.08.0-ppc-sigcontext-musl.patch} | 8 +++----
srcpkgs/ocaml/template | 21 ++++++++-----------
4 files changed, 27 insertions(+), 30 deletions(-)
rename srcpkgs/ocaml/patches/{ocaml-4.04.2-elfv2.patch => ocaml-4.08.0-elfv2-ppc64.patch} (93%)
rename srcpkgs/ocaml/patches/{ocaml-4.04.2-pie.patch => ocaml-4.08.0-ppc-pie.patch} (71%)
rename srcpkgs/ocaml/patches/{ocaml-4.04.2-sigcontext.patch => ocaml-4.08.0-ppc-sigcontext-musl.patch} (77%)
diff --git a/srcpkgs/ocaml/patches/ocaml-4.04.2-elfv2.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-elfv2-ppc64.patch
similarity index 93%
rename from srcpkgs/ocaml/patches/ocaml-4.04.2-elfv2.patch
rename to srcpkgs/ocaml/patches/ocaml-4.08.0-elfv2-ppc64.patch
index d1d195765ca..144a555322a 100644
--- a/srcpkgs/ocaml/patches/ocaml-4.04.2-elfv2.patch
+++ b/srcpkgs/ocaml/patches/ocaml-4.08.0-elfv2-ppc64.patch
@@ -1,5 +1,5 @@
---- ocaml-4.04.2/asmcomp/power/arch.ml
-+++ ocaml-4.04.2/asmcomp/power/arch.ml
+--- ocaml-4.08.0/asmcomp/power/arch.ml
++++ ocaml-4.08.0/asmcomp/power/arch.ml
@@ -28,7 +28,7 @@ type abi = ELF32 | ELF64v1 | ELF64v2
let abi =
match Config.model with
@@ -9,8 +9,8 @@
| "ppc64le" -> ELF64v2
| _ -> assert false
---- ocaml-4.04.2/asmrun/power.S
-+++ ocaml-4.04.2/asmrun/power.S
+--- ocaml-4.08.0/runtime/power.S
++++ ocaml-4.08.0/runtime/power.S
@@ -13,7 +13,7 @@
/* */
/**************************************************************************/
@@ -114,8 +114,8 @@
.section ".opd","aw"
#else
.section ".text"
---- ocaml-4.04.2/testsuite/tests/asmgen/power.S
-+++ ocaml-4.04.2/testsuite/tests/asmgen/power.S
+--- ocaml-4.08.0/testsuite/tools/asmgen_power.S
++++ ocaml-4.08.0/testsuite/tools/asmgen_power.S
@@ -25,12 +25,10 @@
#if defined(MODEL_ppc)
#define RESERVED_STACK 16
@@ -181,9 +181,9 @@
mtctr 28
mr 12, 28
#else
---- ocaml-4.04.2/byterun/caml/stack.h
-+++ ocaml-4.04.2/byterun/caml/stack.h
-@@ -40,10 +40,10 @@
+--- ocaml-4.08.0/runtime/caml/stack.h
++++ ocaml-4.08.0/runtime/caml/stack.h
+@@ -35,10 +35,10 @@
#if defined(MODEL_ppc)
#define Saved_return_address(sp) *((intnat *)((sp) - 4))
#define Callback_link(sp) ((struct caml_context *)((sp) + 16))
diff --git a/srcpkgs/ocaml/patches/ocaml-4.04.2-pie.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
similarity index 71%
rename from srcpkgs/ocaml/patches/ocaml-4.04.2-pie.patch
rename to srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
index 6aed5844d33..138f8185f85 100644
--- a/srcpkgs/ocaml/patches/ocaml-4.04.2-pie.patch
+++ b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
@@ -1,6 +1,6 @@
---- ocaml-4.04.2/asmcomp/emitaux.ml
-+++ ocaml-4.04.2/asmcomp/emitaux.ml
-@@ -205,6 +205,7 @@ let emit_frames a =
+--- 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
@@ -8,8 +8,8 @@
a.efa_word (List.length !frame_descriptors);
List.iter emit_frame !frame_descriptors;
Label_table.iter emit_debuginfo debuginfos;
---- ocaml-4.04.2/asmrun/power.S
-+++ ocaml-4.04.2/asmrun/power.S
+--- ocaml-4.08.0/runtime/power.S
++++ ocaml-4.08.0/runtime/power.S
@@ -642,6 +642,7 @@ caml_system__code_end:
/* Frame table */
diff --git a/srcpkgs/ocaml/patches/ocaml-4.04.2-sigcontext.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-sigcontext-musl.patch
similarity index 77%
rename from srcpkgs/ocaml/patches/ocaml-4.04.2-sigcontext.patch
rename to srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-sigcontext-musl.patch
index 9cad3403931..a40bc5fd64d 100644
--- a/srcpkgs/ocaml/patches/ocaml-4.04.2-sigcontext.patch
+++ b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-sigcontext-musl.patch
@@ -1,5 +1,5 @@
---- ocaml-4.04.2/asmrun/signals_osdep.h
-+++ ocaml-4.04.2/asmrun/signals_osdep.h
+--- ocaml-4.04.2/runtime/signals_osdep.h
++++ ocaml-4.04.2/runtime/signals_osdep.h
@@ -297,11 +297,11 @@
sigact.sa_flags = 0
@@ -15,5 +15,5 @@
+ #define CONTEXT_YOUNG_PTR (context->gp_regs[31])
+ #define CONTEXT_SP (context->gp_regs[1])
- /****************** s390x, ELF (Linux) */
- #elif defined(TARGET_s390x) && defined(SYS_elf)
+ /****************** PowerPC, NetBSD */
+
diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template
index 08cf3a232ca..e2768d23e89 100644
--- a/srcpkgs/ocaml/template
+++ b/srcpkgs/ocaml/template
@@ -1,25 +1,22 @@
# Template file for 'ocaml'
pkgname=ocaml
-version=4.07.1
+version=4.08.0
revision=1
+build_style="gnu-configure"
+configure_args="--with-pic"
+make_build_target="world.opt"
makedepends="ncurses-devel libX11-devel"
-short_desc="The main implementation of the Caml language"
+short_desc="Main implementation of the Caml language"
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=83683ddad54bd23773591a9f757e702fa5cfa2ea1b124d8fe75a73729e592bfe
+checksum=c8ff78d010cb037ac6d6729e40ebdbee109218899007ef23a20b8f459ac186d6
nocross=yes
-disable_parallel_build=yes
patch_args="-Np1"
-do_configure() {
- ./configure -prefix /usr -mandir /usr/share/man -fPIC
-}
-do_build() {
- make ${makejobs} world.opt
-}
-do_install() {
- make PREFIX=${DESTDIR}/usr MANDIR=${DESTDIR}/usr/share/man install
+export ASPP="cc -c"
+
+post_install() {
vlicense LICENSE
}
From 2af5784582919e93f84926277a7d5b20123761ec Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:33:12 +0200
Subject: [PATCH 2/8] ocamlbuild: rebuild for ocaml-4.08.0
---
srcpkgs/ocamlbuild/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ocamlbuild/template b/srcpkgs/ocamlbuild/template
index 539c01f9929..bb7d2201edd 100644
--- a/srcpkgs/ocamlbuild/template
+++ b/srcpkgs/ocamlbuild/template
@@ -1,8 +1,10 @@
# Template file for 'ocamlbuild'
pkgname=ocamlbuild
version=0.14.0
-revision=1
+revision=2
build_style=gnu-makefile
+make_build_args="PREFIX=/usr"
+make_install_args="PREFIX=/usr"
hostmakedepends="ocaml"
short_desc="OCaml build tool"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From aa2f9ee47329bc9497018381764eae32510f9e6e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:45:53 +0200
Subject: [PATCH 3/8] ocaml-findlib: rebuild for ocaml-4.08.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 bef5edb6170..519aa89bbab 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.7.3
-revision=3
+revision=5
build_style=configure
configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man"
make_build_args="all opt"
From 261d4890e7cb5431b8818e7448edac32fe838dfa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:49:57 +0200
Subject: [PATCH 4/8] ocaml-num: rebuild for ocaml-4.08.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 86395a403df..bf5af4e7a68 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.2
-revision=1
+revision=2
build_style=gnu-makefile
makedepends="ocaml ocaml-findlib"
make_install_target="findlib-install"
From 6e87a3a4fe1f4380aad97d0dd4752d73845e8b53 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:56:37 +0200
Subject: [PATCH 5/8] polygen: rebuild for ocaml-4.08.0
---
srcpkgs/polygen/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/polygen/template b/srcpkgs/polygen/template
index a7ceca1d687..7c5df93839c 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=3
+revision=4
build_style=gnu-makefile
build_wrksrc="src"
hostmakedepends="ocaml unzip"
From 3f6afa082328d6277835b663628c8923eddab712 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 10:58:29 +0200
Subject: [PATCH 6/8] supermin: rebuild for ocaml-4.08.0
---
srcpkgs/supermin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supermin/template b/srcpkgs/supermin/template
index 6845ae9aff3..07fe80f46b3 100644
--- a/srcpkgs/supermin/template
+++ b/srcpkgs/supermin/template
@@ -1,7 +1,7 @@
# Template file for 'supermin'
pkgname=supermin
version=5.1.20
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="ocaml ocaml-findlib pkg-config e2fsprogs cpio perl"
makedepends="e2fsprogs-devel"
From e108da8d8847b05afd296cf8abe5d320d1dd771c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jun 2019 11:04:19 +0200
Subject: [PATCH 7/8] z3: rebuild for ocaml-4.08.0
---
srcpkgs/z3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index f4f7af3a8f9..ccd40cf932f 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,7 +1,7 @@
# Template file for 'z3'
pkgname=z3
version=4.8.5
-revision=1
+revision=2
wrksrc="${pkgname}-Z3-${version}"
build_style=configure
configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"
From 9c0d1a5a9af3eef84ee6041b400c37bb028262b9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 12 Jul 2019 18:07:02 +0200
Subject: [PATCH 8/8] opam: update to 2.0.5.
---
srcpkgs/opam/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index 0c9cfaa38c0..efb8f38140b 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,6 +1,6 @@
# Template file for 'opam'
pkgname=opam
-version=2.0.4
+version=2.0.5
revision=1
build_style=gnu-configure
disable_parallel_build=yes
@@ -15,7 +15,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="LGPL-3.0-only"
homepage="http://opam.ocamlpro.com"
distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=956746e4556bfb40ea8e4f05ba5d61f44ed7e03bffddcaf567328290ba52a93c
+checksum=f07f3ea3d4507c8a43cddbd409869377c7878d330c3e8a668424287b989d4fb9
nocross=yes
post_install() {
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2019-07-12 16:08 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-14 9:14 [PR PATCH] [WIP] OCaml 4.08 voidlinux-github
2019-06-14 9:16 ` voidlinux-github
2019-06-14 9:20 ` voidlinux-github
2019-06-21 0:22 ` voidlinux-github
2019-06-21 10:36 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-21 10:36 ` voidlinux-github
2019-07-12 16:07 ` [PR PATCH] [Closed]: " voidlinux-github
2019-07-12 16:07 ` [PR PATCH] [Updated] " voidlinux-github
2019-07-12 16:08 ` voidlinux-github
2019-07-12 16:08 ` voidlinux-github
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).