From 7b0fb20bd6d22d3e2589d369b08232ddf3236787 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 21 Dec 2022 22:16:43 +0100 Subject: [PATCH 01/14] ocaml: update to 5.0.0. --- srcpkgs/ocaml/patches/musl-ppc.patch | 11 - .../patches/ocaml-4.08.0-elfv2-ppc64.patch | 198 ------------------ .../ocaml/patches/ocaml-4.08.0-ppc-pie.patch | 42 ---- srcpkgs/ocaml/template | 17 +- 4 files changed, 6 insertions(+), 262 deletions(-) delete mode 100644 srcpkgs/ocaml/patches/musl-ppc.patch delete mode 100644 srcpkgs/ocaml/patches/ocaml-4.08.0-elfv2-ppc64.patch delete mode 100644 srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch diff --git a/srcpkgs/ocaml/patches/musl-ppc.patch b/srcpkgs/ocaml/patches/musl-ppc.patch deleted file mode 100644 index bc2c10fd43ab..000000000000 --- a/srcpkgs/ocaml/patches/musl-ppc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/runtime/signals_osdep.h -+++ b/runtime/signals_osdep.h -@@ -309,6 +309,8 @@ - - #elif defined(TARGET_power) && defined(SYS_elf) - -+ #include -+ - #define DECLARE_SIGNAL_HANDLER(name) \ - static void name(int sig, struct sigcontext * context) - diff --git a/srcpkgs/ocaml/patches/ocaml-4.08.0-elfv2-ppc64.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-elfv2-ppc64.patch deleted file mode 100644 index 65a6cea92adf..000000000000 --- a/srcpkgs/ocaml/patches/ocaml-4.08.0-elfv2-ppc64.patch +++ /dev/null @@ -1,198 +0,0 @@ ---- 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 - | "ppc" -> ELF32 -- | "ppc64" -> ELF64v1 -+ | "ppc64" -> ELF64v2 - | "ppc64le" -> ELF64v2 - | _ -> assert false - ---- ocaml-4.10.0/runtime/power.S -+++ ocaml-4.10.0/runtime/power.S -@@ -13,7 +13,7 @@ - /* */ - /**************************************************************************/ - --#if defined(MODEL_ppc64le) -+#if _CALL_ELF == 2 - .abiversion 2 - #endif - -@@ -52,8 +52,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 -@@ -64,8 +63,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 -@@ -91,9 +89,8 @@ - #define ENDFUNCTION(name) \ - .size name, . - name - --#endif - --#if defined(MODEL_ppc64) -+#elif _CALL_ELF == 1 - #define FUNCTION(name) \ - .section ".opd","aw"; \ - .align 3; \ -@@ -107,9 +104,8 @@ - #define ENDFUNCTION(name) \ - .size name, . - .L.name - --#endif - --#if defined(MODEL_ppc64le) -+#elif _CALL_ELF == 2 - #define FUNCTION(name) \ - .section ".text"; \ - .globl name; \ -@@ -151,7 +147,7 @@ - - #define Caml_state(var) 8*domain_field_caml_##var(28) - --#if defined(MODEL_ppc64) -+#if _CALL_ELF == 1 - .section ".opd","aw" - #else - .section ".text" -@@ -332,14 +328,14 @@ - #if defined(MODEL_ppc) - mtctr C_CALL_FUN - bctrl --#elif defined(MODEL_ppc64) -+#elif _CALL_ELF == 1 - ld 0, 0(C_CALL_FUN) - mr C_CALL_TOC, 2 /* save current TOC in a callee-save register */ - mtctr 0 - ld 2, 8(C_CALL_FUN) - bctrl - mr 2, C_CALL_TOC /* restore current TOC */ --#elif defined(MODEL_ppc64le) -+#elif _CALL_ELF == 2 - mtctr C_CALL_FUN - mr 12, C_CALL_FUN - mr C_CALL_TOC, 2 /* save current TOC in a callee-save register */ -@@ -515,14 +511,14 @@ - #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 -@@ -641,7 +637,7 @@ - b .L102 - ENDFUNCTION(caml_callback3_asm) - --#if defined(MODEL_ppc64) -+#if _CALL_ELF == 1 - .section ".opd","aw" - #else - .section ".text" ---- 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 - #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.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)) --#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.08.0-ppc-pie.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch deleted file mode 100644 index a26f6a639e18..000000000000 --- a/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- 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; - Label_table.iter emit_debuginfo debuginfos; ---- ocaml-4.08.0/runtime/power.S -+++ ocaml-4.08.0/runtime/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: ---- 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|arm64|s390x|none], -+ [amd64|arm64|s390x|power|none], - # ocamlopt generates PIC code or doesn't generate code at all - [], - [AS_CASE([$host], ---- 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|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 f44b0b83941a..acef81a19055 100644 --- a/srcpkgs/ocaml/template +++ b/srcpkgs/ocaml/template @@ -1,26 +1,21 @@ # Template file for 'ocaml' pkgname=ocaml -version=4.14.0 -revision=2 +version=5.0.0 +revision=1 build_style="gnu-configure" configure_args="--with-pic --libdir=/usr/lib/ocaml" make_build_target="world.opt" -makedepends="ncurses-devel libX11-devel" -short_desc="Main implementation of the Caml language" +makedepends="ncurses-devel" +short_desc="Main implementation of the Objective Caml language" maintainer="Leah Neukirchen " license="QPL-1.0, LGPL-2.1-only" homepage="http://ocaml.org/" -distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz" -checksum=39f44260382f28d1054c5f9d8bf4753cb7ad64027da792f7938344544da155e8 +distfiles="https://github.com/ocaml/ocaml/archive/${version}.tar.gz" +checksum=72fa3d0ba19b82fcb9e6c62e0090b9d22e5905c4be0f94faf56904a9377a9e5b nocross=yes export ASPP="cc -c" -case "$XBPS_TARGET_MACHINE" in - # also just segfaults when compiled without PIE (BSS-PLT?) - ppc-musl) broken="/usr/bin/ocamlc: unsupported relocation type 6";; -esac - post_install() { vlicense LICENSE } From 44f1c76271b3f8de7b29b7d03bc0fd245c979aad Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 21 Dec 2022 22:16:57 +0100 Subject: [PATCH 02/14] ocaml-findlib: update to 1.9.6. --- 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 fb2283612ba8..1e09f9b0d4ef 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.3 -revision=2 +version=1.9.6 +revision=1 build_style=configure configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man" make_build_args="all opt" @@ -11,7 +11,7 @@ maintainer="John Regan " license="MIT" homepage="http://projects.camlcity.org/projects/findlib.html" distfiles="http://download.camlcity.org/download/findlib-${version}.tar.gz" -checksum=c310fcb62838d9e50f0b6d6c5ceefcbe4fe056f72496950ae7d5c6cdaae2cc41 +checksum=2df996279ae16b606db5ff5879f93dbfade0898db9f1a3e82f7f845faa2930a2 nocross=yes nopie=yes disable_parallel_build=yes From a185fd62d7e9e38390118c6f324e5b2fd8d3ba95 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 21 Dec 2022 22:18:25 +0100 Subject: [PATCH 03/14] ocaml-num: rebuild for ocaml-5.0.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 72c9bace0d07..adf35962a57e 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=4 +revision=5 build_style=gnu-makefile make_install_target="findlib-install" makedepends="ocaml ocaml-findlib" From 713ea9b9c895888a61e2a4e84ffb426a9351acca Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 21 Dec 2022 22:18:59 +0100 Subject: [PATCH 04/14] ocaml-zarith: rebuild for ocaml-5.0.0. --- srcpkgs/ocaml-zarith/template | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/srcpkgs/ocaml-zarith/template b/srcpkgs/ocaml-zarith/template index 8c5485e69818..c8c2c5ed0c3b 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=4 +revision=5 build_style=configure make_check_target="tests" hostmakedepends="perl" @@ -19,6 +19,9 @@ disable_parallel_build=yes post_configure() { sed -i 's/INSTALLDIR=/&$(DESTDIR)/' Makefile } +pre_install() { + mkdir -p ${DESTDIR}/usr/lib/ocaml +} post_install() { vcopy META usr/lib/ocaml/zarith } From 48fc5272fa841d8d851b3278e405b67a235c2ae7 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 21 Dec 2022 22:20:43 +0100 Subject: [PATCH 05/14] ocamlbuild: rebuild for ocaml-5.0.0. --- srcpkgs/ocamlbuild/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ocamlbuild/template b/srcpkgs/ocamlbuild/template index 188b9b23dc03..558c8adbed35 100644 --- a/srcpkgs/ocamlbuild/template +++ b/srcpkgs/ocamlbuild/template @@ -1,7 +1,7 @@ # Template file for 'ocamlbuild' pkgname=ocamlbuild version=0.14.2 -revision=1 +revision=2 build_style=gnu-makefile hostmakedepends="ocaml" short_desc="OCaml build tool" From 5840bea8ab88882e1b3e212f48525dedad13df2a Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 21 Dec 2022 22:21:38 +0100 Subject: [PATCH 06/14] ocaml-stdcompat: rebuild for ocaml-5.0.0. --- srcpkgs/ocaml-stdcompat/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ocaml-stdcompat/template b/srcpkgs/ocaml-stdcompat/template index 7bfcf2576ce8..a7251039c3c0 100644 --- a/srcpkgs/ocaml-stdcompat/template +++ b/srcpkgs/ocaml-stdcompat/template @@ -1,7 +1,7 @@ # Template file for 'ocaml-stdcompat' pkgname=ocaml-stdcompat version=19 -revision=1 +revision=2 build_style=gnu-configure configure_args="--libdir=/usr/lib/ocaml" hostmakedepends="automake" From 3c945b38fbc5749958cbd4f7f80031985efb6f83 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 21 Dec 2022 22:22:41 +0100 Subject: [PATCH 07/14] hivex: rebuild for ocaml-5.0.0. --- srcpkgs/hivex/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template index e6b15e5a990e..e572186a53a9 100644 --- a/srcpkgs/hivex/template +++ b/srcpkgs/hivex/template @@ -1,7 +1,7 @@ # Template file for 'hivex' pkgname=hivex version=1.3.21 -revision=7 +revision=8 build_style=gnu-configure configure_args="--disable-ocaml" # currently ocaml is broken hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy" From c03e17409bd773e97c1465ae6911d3f882ca3656 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 21 Dec 2022 22:26:09 +0100 Subject: [PATCH 08/14] opam: update to 2.1.4. --- srcpkgs/opam/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template index 743c1afdd7b0..a5531ad96c4f 100644 --- a/srcpkgs/opam/template +++ b/srcpkgs/opam/template @@ -1,6 +1,6 @@ # Template file for 'opam' pkgname=opam -version=2.1.3 +version=2.1.4 revision=1 build_style=gnu-configure configure_args="--docdir=/usr/share/doc/${pkgname}" @@ -13,8 +13,8 @@ short_desc="OCaml package manager" maintainer="Leah Neukirchen " license="LGPL-3.0-only" homepage="https://opam.ocaml.org/" -distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz" -checksum=5da29e1eb565f0c65a9f1810f91820b1036e6ecc592e3ed4615dfdfcec442c60 +distfiles="https://github.com/ocaml/opam/archive/${version}.tar.gz" +checksum=06aa6c96ccf68bb8be3864d984bd7c54329eabb4082d7c07232cd4d18c55e7c4 nocross=yes disable_parallel_build=yes make_check=ci-skip # uses bwrap From 369f453c6c922d984976122531a3acb09f14e821 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 21 Dec 2022 22:35:49 +0100 Subject: [PATCH 09/14] pdfsandwich: rebuild for ocaml-5.0.0. --- srcpkgs/pdfsandwich/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pdfsandwich/template b/srcpkgs/pdfsandwich/template index 82f2f934fdc1..c03a84f10161 100644 --- a/srcpkgs/pdfsandwich/template +++ b/srcpkgs/pdfsandwich/template @@ -1,7 +1,7 @@ # Template file for 'pdfsandwich' pkgname=pdfsandwich version=0.1.7 -revision=6 +revision=7 build_style=gnu-configure hostmakedepends="ocaml perl" makedepends="ocaml" From 688e91edd21d0c6a27e4e172cf6569970c33c1dd Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 21 Dec 2022 22:39:35 +0100 Subject: [PATCH 10/14] z3: rebuild for ocaml-5.0.0. --- srcpkgs/z3/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template index 50f8a9c3650b..77404c8f0e23 100644 --- a/srcpkgs/z3/template +++ b/srcpkgs/z3/template @@ -1,7 +1,7 @@ # Template file for 'z3' pkgname=z3 version=4.11.2 -revision=2 +revision=3 build_style=configure configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)" make_build_args="-C build all examples" From eed1ee41c0adf1ffdf7b55193cd8f9a663990cda Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 21 Dec 2022 23:03:11 +0100 Subject: [PATCH 11/14] unison: rebuild for ocaml-5.0.0. --- srcpkgs/unison/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template index bedb4b9d671c..17e1921735e7 100644 --- a/srcpkgs/unison/template +++ b/srcpkgs/unison/template @@ -1,7 +1,7 @@ # Template file for 'unison' pkgname=unison version=2.53.0 -revision=1 +revision=2 hostmakedepends="ocaml" short_desc="File-synchronization tool" maintainer="Andrew J. Hesford " From 9ac47b16c357b14473b6baed7f0743da65d2c523 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 21 Dec 2022 23:05:52 +0100 Subject: [PATCH 12/14] dune: update to 3.6.2. --- srcpkgs/dune/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dune/template b/srcpkgs/dune/template index c84daa5ba2b4..49f0bfac3ee5 100644 --- a/srcpkgs/dune/template +++ b/srcpkgs/dune/template @@ -1,6 +1,6 @@ # Template file for 'dune' pkgname=dune -version=3.6.1 +version=3.6.2 revision=1 makedepends="ocaml" depends="ocaml" @@ -9,7 +9,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="https://dune.build/" distfiles="https://github.com/ocaml/dune/archive/refs/tags/${version}.tar.gz" -checksum=89eb18ff7d3808812e9422b36713336cabc2bd48e875621facee1307ff082f6a +checksum=84c29d5d1d417518a9c33e87409dd865fed4cd5ba069b43ff8e030603474e81b nocross="ocaml" _dune_release_pkgs="dune dune-build-info dune-configurator From df06714cb56fa7c23c3d6dab1e0886004371c8f4 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 21 Dec 2022 23:04:57 +0100 Subject: [PATCH 13/14] ocaml-camlp-streams: rebuild for ocaml-5.0.0. --- srcpkgs/ocaml-camlp-streams/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ocaml-camlp-streams/template b/srcpkgs/ocaml-camlp-streams/template index e32f04aae51b..4b7f1bae0887 100644 --- a/srcpkgs/ocaml-camlp-streams/template +++ b/srcpkgs/ocaml-camlp-streams/template @@ -1,7 +1,7 @@ # Template file for 'ocaml-camlp-streams' pkgname=ocaml-camlp-streams version=5.0.1 -revision=1 +revision=2 makedepends="ocaml dune" short_desc="Stream and Genlex libraries for use with Camlp4 and Camlp5" maintainer="Leah Neukirchen " From eb228d09d09fd9958bf57693b1f61f18d61f8e07 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 21 Dec 2022 23:04:16 +0100 Subject: [PATCH 14/14] camlp5: rebuild for ocaml-5.0.0. --- srcpkgs/camlp5/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template index 62223f806a0f..154fc80c35d7 100644 --- a/srcpkgs/camlp5/template +++ b/srcpkgs/camlp5/template @@ -1,7 +1,7 @@ # Template file for 'camlp5' pkgname=camlp5 version=8.00.04 -revision=1 +revision=2 build_style=configure configure_args="-mandir /usr/share/man" hostmakedepends="ocaml perl ocaml-findlib"