Attachment 254270 Details for Bug 280227 – Update devel/ocaml-opam to 2.2.1

[patch] Update devel/ocaml-opam to 2.2.1

devel-ocaml-opam-2-2-1.diff (text/plain), 4.67 KB, created by Hannes Mehnert on 2024-10-15 19:22:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hannes Mehnert

Created: 2024-10-15 19:22:59 UTC

Size: 4.67 KB

patch

obsolete

>diff --git a/devel/ocaml-opam/Makefile b/devel/ocaml-opam/Makefile
>index 6ee5fe018b6..83913ec08df 100644
>--- a/devel/ocaml-opam/Makefile
>+++ b/devel/ocaml-opam/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	opam
>-DISTVERSION=	2.1.6
>+DISTVERSION=	2.2.1
> CATEGORIES=	devel
> MASTER_SITES=	https://github.com/ocaml/opam/releases/download/${DISTVERSION}/
> PKGNAMEPREFIX=	ocaml-
>@@ -24,10 +24,10 @@ USE_BINUTILS=	yes
> 
> GNU_CONFIGURE=	yes
> GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
>-CONFIGURE_ARGS=	--disable-checks
>+CONFIGURE_ARGS=	--with-vendored-deps --with-mccs
> 
> MAKE_JOBS_UNSAFE=	yes
>-ALL_TARGET=	cold-lib-ext cold-all
>+ALL_TARGET=	cold-all
> 
> LDFLAGS_armv6=	-Wl,-z,notext
> LDFLAGS_armv7=	-Wl,-z,notext
>diff --git a/devel/ocaml-opam/distinfo b/devel/ocaml-opam/distinfo
>index 4b15d663b0a..607fab39527 100644
>--- a/devel/ocaml-opam/distinfo
>+++ b/devel/ocaml-opam/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1715883550
>-SHA256 (opam-full-2.1.6.tar.gz) = d2af5edc85f552e0cf5ec0ddcc949d94f2dc550dc5df595174a06a4eaf8af628
>-SIZE (opam-full-2.1.6.tar.gz) = 11704198
>+TIMESTAMP = 1729018045
>+SHA256 (opam-full-2.2.1.tar.gz) = 07ad3887f61e0bc61a0923faae16fcc141285ece5b248a9e2cd4f902523cc121
>+SIZE (opam-full-2.2.1.tar.gz) = 12775920
>diff --git a/devel/ocaml-opam/files/patch-shell_bootstrap-ocaml.sh b/devel/ocaml-opam/files/patch-shell_bootstrap-ocaml.sh
>index a70a0a9b9c9..0aa13d3cc53 100644
>--- a/devel/ocaml-opam/files/patch-shell_bootstrap-ocaml.sh
>+++ b/devel/ocaml-opam/files/patch-shell_bootstrap-ocaml.sh
>@@ -1,9 +1,9 @@
> --- shell/bootstrap-ocaml.sh.orig	2023-05-27 13:09:27 UTC
> +++ shell/bootstrap-ocaml.sh
> @@ -42,6 +42,9 @@
>-   mkdir -p ${V}
>+   mkdir -p ocaml-${V}
>  fi
>- cd ${V}
>+ cd ocaml-${V}
> +for p in ../../src_ext/ocaml-patches/*.patch; do
> +  patch -p1 < $p;
> +done;
>diff --git a/devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0001-Fix-relocation-ocaml-32-bit.patch b/devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0001-arm-powerpc.patch
>similarity index 80%
>rename from devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0001-Fix-relocation-ocaml-32-bit.patch
>rename to devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0001-arm-powerpc.patch
>index 23e6f41d0a9..23d42ded5f2 100644
>--- a/devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0001-Fix-relocation-ocaml-32-bit.patch
>+++ b/devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0001-arm-powerpc.patch
>@@ -1,9 +1,9 @@
>---- src_ext/ocaml-patches/0001-Fix-relocation-ocaml-32-bit.patch.orig	2023-05-27 13:17:37 UTC
>-+++ src_ext/ocaml-patches/0001-Fix-relocation-ocaml-32-bit.patch
>+--- src_ext/ocaml-patches/0001-arm-powerpc.patch	2023-05-27 13:17:37 UTC
>++++ src_ext/ocaml-patches/0001-arm-powerpc.patch
> @@ -0,0 +1,32 @@
> +--- a/configure.orig	2023-05-27 13:13:22 UTC
> ++++ a/configure
>-+@@ -14256,12 +14256,20 @@ case $host in #(
>++@@ -14344,12 +14344,20 @@ case $host in #(
> +     arch=amd64; system=win64 ;; #(
> +   powerpc64le*-*-linux*) :
> +     arch=power; model=ppc64le; system=elf ;; #(
>@@ -24,7 +24,7 @@
> +   s390x*-*-linux*) :
> +     arch=s390x; model=z10; system=elf ;; #(
> +   # expected to match "gnueabihf" as well as "musleabihf"
>-+@@ -14281,6 +14289,8 @@
>++@@ -14369,6 +14377,8 @@
> +     arch=arm; model=armv6; system=linux_eabi ;; #(
> +   armv6*-*-freebsd*) :
> +     arch=arm; model=armv6; system=freebsd ;; #(
>diff --git a/devel/ocaml-opam/pkg-plist b/devel/ocaml-opam/pkg-plist
>index dca86ff640d..8e9a6067332 100644
>--- a/devel/ocaml-opam/pkg-plist
>+++ b/devel/ocaml-opam/pkg-plist
>@@ -10,6 +10,7 @@ share/man/man1/opam-admin-index.1.gz
> share/man/man1/opam-admin-lint.1.gz
> share/man/man1/opam-admin-list.1.gz
> share/man/man1/opam-admin-make.1.gz
>+share/man/man1/opam-admin-update-extrafiles.1.gz
> share/man/man1/opam-admin-upgrade.1.gz
> share/man/man1/opam-admin.1.gz
> share/man/man1/opam-clean.1.gz
>@@ -21,22 +22,24 @@ share/man/man1/opam-info.1.gz
> share/man/man1/opam-init.1.gz
> share/man/man1/opam-install.1.gz
> share/man/man1/opam-installer.1.gz
>-share/man/man1/opam-list.1.gz
> share/man/man1/opam-lint.1.gz
>+share/man/man1/opam-list.1.gz
> share/man/man1/opam-lock.1.gz
> share/man/man1/opam-option.1.gz
> share/man/man1/opam-pin.1.gz
> share/man/man1/opam-reinstall.1.gz
>-share/man/man1/opam-remove.1.gz
> share/man/man1/opam-remote.1.gz
>+share/man/man1/opam-remove.1.gz
> share/man/man1/opam-repository.1.gz
> share/man/man1/opam-search.1.gz
>-share/man/man1/opam-source.1.gz
> share/man/man1/opam-show.1.gz
>+share/man/man1/opam-source.1.gz
> share/man/man1/opam-switch.1.gz
>-share/man/man1/opam-update.1.gz
>-share/man/man1/opam-upgrade.1.gz
>+share/man/man1/opam-tree.1.gz
> share/man/man1/opam-uninstall.1.gz
> share/man/man1/opam-unpin.1.gz
>+share/man/man1/opam-update.1.gz
>+share/man/man1/opam-upgrade.1.gz
> share/man/man1/opam-var.1.gz
>+share/man/man1/opam-why.1.gz
> share/man/man1/opam.1.gz

Flags:

hannes: maintainer-approval+

Actions: View | Diff

Attachments on bug 280227: 251978 | 254270