git: e1d740eccccd - main - devel/ocaml-opam: Update to 2.1.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 25 Dec 2021 20:45:32 UTC
The branch main has been updated by ygy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e1d740eccccdf0d3afe982c635c4a5e397881ebd
commit e1d740eccccdf0d3afe982c635c4a5e397881ebd
Author: Hannes Mehnert <hannes@mehnert.org>
AuthorDate: 2021-12-25 20:45:09 +0000
Commit: Guangyuan Yang <ygy@FreeBSD.org>
CommitDate: 2021-12-25 20:45:09 +0000
devel/ocaml-opam: Update to 2.1.2
Changelog: https://github.com/ocaml/opam/blob/2.1.2/CHANGES
PR: 259667
---
devel/ocaml-opam/Makefile | 10 +++--
devel/ocaml-opam/distinfo | 6 +--
.../files/patch-shell_bootstrap-ocaml.sh | 20 ++++++++++
...-patches_0001-Fix-relocation-ocaml-32-bit.patch | 45 ++++++++++++++++++++++
devel/ocaml-opam/pkg-plist | 2 +
5 files changed, 76 insertions(+), 7 deletions(-)
diff --git a/devel/ocaml-opam/Makefile b/devel/ocaml-opam/Makefile
index 216e1187710e..3a81818bb035 100644
--- a/devel/ocaml-opam/Makefile
+++ b/devel/ocaml-opam/Makefile
@@ -1,8 +1,7 @@
# Created by: J. Giovannangeli
PORTNAME= opam
-PORTVERSION= 2.0.8
-PORTREVISION= 2
+PORTVERSION= 2.1.2
CATEGORIES= devel
MASTER_SITES= https://github.com/ocaml/opam/releases/download/${DISTVERSION}/
PKGNAMEPREFIX= ocaml-
@@ -17,13 +16,12 @@ RUN_DEPENDS= curl:ftp/curl \
gpatch:devel/patch
USES= gmake
-USE_OCAML= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-checks
MAKE_JOBS_UNSAFE= yes
-ALL_TARGET= lib-ext all
+ALL_TARGET= cold-lib-ext cold-all
OPTIONS_DEFINE= DARCS GIT MERCURIAL RSYNC
OPTIONS_DEFAULT= GIT RSYNC
@@ -36,7 +34,11 @@ GIT_RUN_DEPENDS= git:devel/git
MERCURIAL_RUN_DEPENDS= ${PY_MERCURIAL}
RSYNC_RUN_DEPENDS= rsync:net/rsync
+pre-configure:
+ cd ${WRKSRC} && ${MAKE_CMD} compiler
+
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/opam-installer
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/opam
.include <bsd.port.mk>
diff --git a/devel/ocaml-opam/distinfo b/devel/ocaml-opam/distinfo
index 36d20180749e..5fb45c6fecbf 100644
--- a/devel/ocaml-opam/distinfo
+++ b/devel/ocaml-opam/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612798209
-SHA256 (opam-full-2.0.8.tar.gz) = 7b9d29233d9633ef50ba766df2e39112b15cd05c1c6fedf80bcb548debcdd9bd
-SIZE (opam-full-2.0.8.tar.gz) = 8006252
+TIMESTAMP = 1640170441
+SHA256 (opam-full-2.1.2.tar.gz) = de1e3efffd5942e0101ef83dcdead548cc65a93e13986aecb4a264a059457ede
+SIZE (opam-full-2.1.2.tar.gz) = 9442446
diff --git a/devel/ocaml-opam/files/patch-shell_bootstrap-ocaml.sh b/devel/ocaml-opam/files/patch-shell_bootstrap-ocaml.sh
new file mode 100644
index 000000000000..afa9173af3b5
--- /dev/null
+++ b/devel/ocaml-opam/files/patch-shell_bootstrap-ocaml.sh
@@ -0,0 +1,20 @@
+--- shell/bootstrap-ocaml.sh.orig 2021-12-07 16:13:53 UTC
++++ shell/bootstrap-ocaml.sh
+@@ -8,7 +8,6 @@ elif command -v wget > /dev/null; then
+ CURL=wget
+ else
+ echo "This script requires curl or wget"
+- exit 1
+ fi
+ BOOTSTRAP_DIR=${BOOTSTRAP_DIR:-bootstrap}
+ BOOTSTRAP_ROOT=${BOOTSTRAP_ROOT:-..}
+@@ -43,6 +42,9 @@ else
+ 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
new file mode 100644
index 000000000000..feb111b6dbbe
--- /dev/null
+++ b/devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0001-Fix-relocation-ocaml-32-bit.patch
@@ -0,0 +1,45 @@
+--- src_ext/ocaml-patches/0001-Fix-relocation-ocaml-32-bit.patch.orig 2021-12-25 16:24:31 UTC
++++ src_ext/ocaml-patches/0001-Fix-relocation-ocaml-32-bit.patch
+@@ -0,0 +1,42 @@
++diff --git a/configure b/configure
++index b1e287aed..4754e8ab2 100755
++--- a/configure
+++++ b/configure
++@@ -14120,6 +14120,17 @@ case $arch in #(
++ esac ;;
++ esac
++
+++# Disable DT_TEXTREL warnings on Linux i386
+++# See https://github.com/ocaml/ocaml/issues/9800
+++
+++case "$system" in #(
+++ linux_elf|bsd_elf) :
+++ mksharedlib="$mksharedlib -Wl,-z,notext"
+++ mkmaindll="$mkmaindll -Wl,-z,notext" ;; #(
+++ *) :
+++ ;;
+++esac
+++
++ # Assembler
++
++ if test -n "$host_alias"; then :
++diff --git a/configure.ac b/configure.ac
++index 656ffe20c..1c9694805 100644
++--- a/configure.ac
+++++ b/configure.ac
++@@ -1070,6 +1070,15 @@ AS_CASE([$arch],
++ [common_cflags="-no-pie $common_cflags"],
++ [])])
++
+++# Disable DT_TEXTREL warnings on Linux i386
+++# See https://github.com/ocaml/ocaml/issues/9800
+++
+++AS_CASE(["$system"],
+++ [linux_elf|bsd_elf],
+++ [mksharedlib="$mksharedlib -Wl,-z,notext"
+++ mkmaindll="$mkmaindll -Wl,-z,notext"],
+++ [])
+++
++ # Assembler
++
++ AS_IF([test -n "$host_alias"], [toolpref="${host_alias}-"], [toolpref=""])
diff --git a/devel/ocaml-opam/pkg-plist b/devel/ocaml-opam/pkg-plist
index 9634444a7d62..5be9bb628de8 100644
--- a/devel/ocaml-opam/pkg-plist
+++ b/devel/ocaml-opam/pkg-plist
@@ -23,6 +23,8 @@ man/man1/opam-install.1.gz
man/man1/opam-installer.1.gz
man/man1/opam-list.1.gz
man/man1/opam-lint.1.gz
+man/man1/opam-lock.1.gz
+man/man1/opam-option.1.gz
man/man1/opam-pin.1.gz
man/man1/opam-reinstall.1.gz
man/man1/opam-remove.1.gz