Attachment 251978 Details for Bug 280227 – opam-2.2.0.patch

[patch] opam-2.2.0.patch

freebsd-opam-2.2.0.patch (text/plain), 4.15 KB, created by kit-ty-kate on 2024-07-11 16:50:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: kit-ty-kate

Created: 2024-07-11 16:50:03 UTC

Size: 4.15 KB

patch

obsolete

>diff --git a/devel/ocaml-opam/Makefile b/devel/ocaml-opam/Makefile
>index 6ee5fe018b62..32819c30eae8 100644
>--- a/devel/ocaml-opam/Makefile
>+++ b/devel/ocaml-opam/Makefile
>@@ -1,9 +1,9 @@
> PORTNAME=	opam
>-DISTVERSION=	2.1.6
>+DISTVERSION=	2.2.0
> CATEGORIES=	devel
> MASTER_SITES=	https://github.com/ocaml/opam/releases/download/${DISTVERSION}/
> PKGNAMEPREFIX=	ocaml-
>-DISTNAME=	opam-full-${DISTVERSION}
>+DISTNAME=	opam-full-${DISTVERSION}-2
> 
> MAINTAINER=	hannes@mehnert.org
> COMMENT=	Source-based package manager for 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
> 
> LDFLAGS_armv6=	-Wl,-z,notext
> LDFLAGS_armv7=	-Wl,-z,notext
>@@ -48,9 +48,6 @@ GIT_RUN_DEPENDS=	git:devel/git
> MERCURIAL_RUN_DEPENDS=	${PY_MERCURIAL}
> RSYNC_RUN_DEPENDS=	rsync:net/rsync
> 
>-pre-configure:
>-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} compiler)
>-
> post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/opam-installer
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/opam
>diff --git a/devel/ocaml-opam/files/patch-Makefile b/devel/ocaml-opam/files/patch-Makefile
>deleted file mode 100644
>index 9e275c51ad28..000000000000
>--- a/devel/ocaml-opam/files/patch-Makefile
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Makefile.orig	2023-05-27 12:33:21 UTC
>-+++ Makefile
>-@@ -258,7 +258,7 @@
>- 
>- .PHONY: compiler cold
>- compiler:
>--	env MAKE=$(MAKE) BOOTSTRAP_EXTRA_OPTS= BOOTSTRAP_TARGETS=world.opt BOOTSTRAP_ROOT=.. BOOTSTRAP_DIR=bootstrap ./shell/bootstrap-ocaml.sh $(OCAML_PORT)
>-+	env CC="$(CC)" MAKE=$(MAKE) BOOTSTRAP_EXTRA_OPTS= BOOTSTRAP_TARGETS=world.opt BOOTSTRAP_ROOT=.. BOOTSTRAP_DIR=bootstrap ./shell/bootstrap-ocaml.sh $(OCAML_PORT)
>- 
>- src_ext/secondary/ocaml/bin/ocaml:
>- 	env MAKE=$(MAKE) BOOTSTRAP_EXTRA_OPTS="--disable-ocamldoc --disable-debug-runtime --disable-debugger" BOOTSTRAP_TARGETS="world opt" BOOTSTRAP_ROOT=../.. BOOTSTRAP_DIR=src_ext/secondary ./shell/bootstrap-ocaml.sh $(OCAML_PORT)
>diff --git a/devel/ocaml-opam/files/patch-shell_bootstrap-ocaml.sh b/devel/ocaml-opam/files/patch-shell_bootstrap-ocaml.sh
>deleted file mode 100644
>index a70a0a9b9c99..000000000000
>--- a/devel/ocaml-opam/files/patch-shell_bootstrap-ocaml.sh
>+++ /dev/null
>@@ -1,12 +0,0 @@
>---- shell/bootstrap-ocaml.sh.orig	2023-05-27 13:09:27 UTC
>-+++ shell/bootstrap-ocaml.sh
>-@@ -42,6 +42,9 @@
>-   mkdir -p ${V}
>- fi
>- cd ${V}
>-+for p in ../../src_ext/ocaml-patches/*.patch; do
>-+  patch -p1 < $p;
>-+done;
>- PATH_PREPEND=
>- LIB_PREPEND=
>- INC_PREPEND=
>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-Fix-relocation-ocaml-32-bit.patch
>deleted file mode 100644
>index 23e6f41d0a99..000000000000
>--- a/devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0001-Fix-relocation-ocaml-32-bit.patch
>+++ /dev/null
>@@ -1,35 +0,0 @@
>---- 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
>-@@ -0,0 +1,32 @@
>-+--- a/configure.orig	2023-05-27 13:13:22 UTC
>-++++ a/configure
>-+@@ -14256,12 +14256,20 @@ case $host in #(
>-+     arch=amd64; system=win64 ;; #(
>-+   powerpc64le*-*-linux*) :
>-+     arch=power; model=ppc64le; system=elf ;; #(
>-++  powerpc64le*-*-freebsd*) :
>-++    arch=power; model=ppc64le; system=bsd_elf ;; #(
>-+   powerpc*-*-linux*) :
>-+     arch=power; if $arch64; then :
>-+   model=ppc64
>-+ else
>-+   model=ppc
>-+ fi; system=elf ;; #(
>-++  powerpc*-*-freebsd*) :
>-++    arch=power; if $arch64; then :
>-++  model=ppc64
>-++else
>-++  model=ppc
>-++fi; system=bsd_elf ;; #(
>-+   s390x*-*-linux*) :
>-+     arch=s390x; model=z10; system=elf ;; #(
>-+   # expected to match "gnueabihf" as well as "musleabihf"
>-+@@ -14281,6 +14289,8 @@
>-+     arch=arm; model=armv6; system=linux_eabi ;; #(
>-+   armv6*-*-freebsd*) :
>-+     arch=arm; model=armv6; system=freebsd ;; #(
>-++  armv7*-*-freebsd*) :
>-++    arch=arm; model=armv7; system=freebsd ;; #(
>-+   earmv6*-*-netbsd*) :
>-+     arch=arm; model=armv6; system=netbsd ;; #(
>-+   earmv7*-*-netbsd*) :

Actions: View | Diff

Attachments on bug 280227: 251978 | 254270