From 3e29d6c827a99fc136b88c0d46645665fe18b9f6 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 13 Apr 2022 20:45:24 +0200 Subject: [PATCH] ocaml: update to 4.14.0. --- srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch | 16 ++++++++-------- srcpkgs/ocaml/template | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch index 333276741c..a26f6a639e 100644 --- a/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch +++ b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch @@ -18,25 +18,25 @@ .globl caml_system__frametable .type caml_system__frametable, @object caml_system__frametable: ---- ocaml-4.11.0/configure.ac -+++ ocaml-4.11.0/configure.ac +--- ocaml-4.14.0/configure.ac ++++ ocaml-4.14.0/configure.ac @@ -1006,7 +1006,7 @@ AS_IF([test $arch != "none" && $arch64 ], # e.g. Ubuntu >= 17.10 for i386, which uses the glibc dynamic loader. AS_CASE([$arch], -- [amd64|s390x|none], -+ [amd64|s390x|power|none], +- [amd64|arm64|s390x|none], ++ [amd64|arm64|s390x|power|none], # ocamlopt generates PIC code or doesn't generate code at all [], [AS_CASE([$host], ---- ocaml-4.11.0/configure -+++ ocaml-4.11.0/configure +--- ocaml-4.14.0/configure ++++ ocaml-4.14.0/configure @@ -13886,7 +13886,7 @@ # e.g. Ubuntu >= 17.10 for i386, which uses the glibc dynamic loader. case $arch in #( -- amd64|s390x|none) : -+ amd64|s390x|power|none) : +- amd64|arm64|s390x|none) : ++ amd64|arm64|s390x|power|none) : # ocamlopt generates PIC code or doesn't generate code at all ;; #( *) : diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template index 629c13791d..7de25d70b8 100644 --- a/srcpkgs/ocaml/template +++ b/srcpkgs/ocaml/template @@ -1,7 +1,7 @@ # Template file for 'ocaml' pkgname=ocaml -version=4.13.1 -revision=2 +version=4.14.0 +revision=1 build_style="gnu-configure" configure_args="--with-pic --libdir=/usr/lib/ocaml" make_build_target="world.opt" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="QPL-1.0, LGPL-2.1-only" homepage="http://ocaml.org/" distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz" -checksum=194c7988cc1fd1c64f53f32f2f7551e5309e44d914d6efc7e2e4d002296aeac4 +checksum=39f44260382f28d1054c5f9d8bf4753cb7ad64027da792f7938344544da155e8 nocross=yes export ASPP="cc -c"