From nobody Mon May 29 23:26:11 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QVWql6Mxvz4XM46; Mon, 29 May 2023 23:26:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QVWql4Ttcz3lcj; Mon, 29 May 2023 23:26:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685402771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wxPA7kyeKRw64bD2o2QW+R7G2pXykzdUswZXR/Mag/4=; b=ROGB/rMpyw+JzrZcWu/hNKXhVpz0B/MzrCnZhNBHyZ57G23JGyjbVs1b1hoeJ6ZhWE+9fW OzsNSMbjkIJRBhPkIy3Ms/mJ/oUS7Pdwiw6SSDwYzqgRKeguvgIGXe7m5ydfZYdygOQNqm XoRsUqL3gej7RyirRtAPD+pEEwfdlA4pWQdwZ9NP7KXT0y5nzhuSMI5lHvmhrb8ebNXGcX Rh9YXivh1va2QW8dk2IjTTxFAE8JZo00ie/KiaySS3gSbfowHXtpRq7kAoJwWQQRuP0quF y1wu+hy0v0d36kt8EPN08QfgScVXLr2sdc0qoOFs331JzICJUuNGCNLXASzqTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685402771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wxPA7kyeKRw64bD2o2QW+R7G2pXykzdUswZXR/Mag/4=; b=KDDQI3OL+G7FScJmRtDJDOJoY9WjQ5cmBOGEa7O4OAcmBYE3t4kRSlIt3d8cQmJkZqbUnK jT2Tz1cfsXC14j60sQw4iXgCBWi1zQY/Gt+fHJMoG/SrvvE1I+o9Zx3udldAwmUygOqkpH RFojxPEmGXvgsGJaSb2AVDsfnQrnIvPM5gXL/y1ixuH76Jf5HTMSuLiEirjm776csI9JEf 27fWLSDTqz/C7AzxuFVeWtqdKH3QFeSiKj1SmxwomqNMD+Qqx0gkJ8oSgCab2dvQBOZAJZ 7BoNpm7Nzl34anq1ntYoKldDZuYHcsc50VvT2Foc11a9eimi7JqiXGnpaxtSbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685402771; a=rsa-sha256; cv=none; b=VhShA1Ho9HXVEfV0JUIP5PUnJ0/oZUNz6G3Vk5ooGfkOfKX5hrTKsRyghn5Fko0kiAgiZH V6QQ25KDuiMd19O4PBJVYHBAuNfwFWjpXU3hNoKCuksGj25R4AuBBrUQyMwuzvcTAegJ6l ZsbhoU0OCn7Rh4PZOOVizE700Kgm6l0E04mlOakW+LuovH1zAZ+xriIG3r9pQlOQwd4zuf pCC/B5SlJlYqNTgjaAd0XDRldJkfv+S9Fr4idrsDkUVKLar9L24+dqJy982rmIqowhdaUg +n5SnoClOKCuC5s0Y5j2eAZyIaGZ5ldE3Tj1BZrW0CGz5y5tGfBAst5M46mf8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QVWql3ZvCzWP9; Mon, 29 May 2023 23:26:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34TNQBsO064296; Mon, 29 May 2023 23:26:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34TNQBaV064295; Mon, 29 May 2023 23:26:11 GMT (envelope-from git) Date: Mon, 29 May 2023 23:26:11 GMT Message-Id: <202305292326.34TNQBaV064295@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 5ac3886b7616 - main - devel/ocaml-opam: update to 2.1.5 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ac3886b7616aee99bec227268c08f98068a7a5b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=5ac3886b7616aee99bec227268c08f98068a7a5b commit 5ac3886b7616aee99bec227268c08f98068a7a5b Author: Hannes Mehnert AuthorDate: 2023-05-27 13:37:32 +0000 Commit: Robert Clausecker CommitDate: 2023-05-29 23:25:16 +0000 devel/ocaml-opam: update to 2.1.5 - attempt to patch the build for armv7 - realise that it still doesn't build and mark as BROKEN_armv[67] Changelog: https://github.com/ocaml/opam/blob/2.1/CHANGES PR: 271674 --- devel/ocaml-opam/Makefile | 6 +- devel/ocaml-opam/distinfo | 6 +- devel/ocaml-opam/files/patch-Makefile | 10 ++-- .../files/patch-shell_bootstrap-ocaml.sh | 14 +---- ...-patches_0001-Fix-relocation-ocaml-32-bit.patch | 66 ++++++++-------------- 5 files changed, 38 insertions(+), 64 deletions(-) diff --git a/devel/ocaml-opam/Makefile b/devel/ocaml-opam/Makefile index 7a231f9b2ff5..7452bf3fb013 100644 --- a/devel/ocaml-opam/Makefile +++ b/devel/ocaml-opam/Makefile @@ -1,6 +1,5 @@ PORTNAME= opam -PORTVERSION= 2.1.2 -PORTREVISION= 1 +DISTVERSION= 2.1.5 CATEGORIES= devel MASTER_SITES= https://github.com/ocaml/opam/releases/download/${DISTVERSION}/ PKGNAMEPREFIX= ocaml- @@ -12,6 +11,9 @@ WWW= https://opam.ocaml.org/ LICENSE= LGPL21 +BROKEN_armv6= ld: error: can't create dynamic relocation R_ARM_ABS32 against symbol: caml_program in readonly segment +BROKEN_armv7= ld: error: can't create dynamic relocation R_ARM_ABS32 against symbol: caml_program in readonly segment + RUN_DEPENDS= curl:ftp/curl \ gpatch:devel/patch diff --git a/devel/ocaml-opam/distinfo b/devel/ocaml-opam/distinfo index 5fb45c6fecbf..c20f25b31732 100644 --- a/devel/ocaml-opam/distinfo +++ b/devel/ocaml-opam/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1640170441 -SHA256 (opam-full-2.1.2.tar.gz) = de1e3efffd5942e0101ef83dcdead548cc65a93e13986aecb4a264a059457ede -SIZE (opam-full-2.1.2.tar.gz) = 9442446 +TIMESTAMP = 1685183447 +SHA256 (opam-full-2.1.5.tar.gz) = 15e40a75f6fa419164fb20bedd27c851146c2d576a63937cd13b317f3bc2ab93 +SIZE (opam-full-2.1.5.tar.gz) = 53353534 diff --git a/devel/ocaml-opam/files/patch-Makefile b/devel/ocaml-opam/files/patch-Makefile index 76bc788026c4..9e275c51ad28 100644 --- a/devel/ocaml-opam/files/patch-Makefile +++ b/devel/ocaml-opam/files/patch-Makefile @@ -1,11 +1,11 @@ ---- Makefile.orig 2021-12-07 16:13:53 UTC +--- Makefile.orig 2023-05-27 12:33:21 UTC +++ Makefile -@@ -252,7 +252,7 @@ endif +@@ -258,7 +258,7 @@ .PHONY: compiler cold compiler: -- env MAKE=$(MAKE) BOOTSTRAP_EXTRA_OPTS= BOOTSTRAP_OPT_TARGET=opt.opt BOOTSTRAP_ROOT=.. BOOTSTRAP_DIR=bootstrap ./shell/bootstrap-ocaml.sh $(OCAML_PORT) -+ env CC="$(CC)" MAKE=$(MAKE) BOOTSTRAP_EXTRA_OPTS= BOOTSTRAP_OPT_TARGET=opt.opt BOOTSTRAP_ROOT=.. BOOTSTRAP_DIR=bootstrap ./shell/bootstrap-ocaml.sh $(OCAML_PORT) +- 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_OPT_TARGET=opt BOOTSTRAP_ROOT=../.. BOOTSTRAP_DIR=src_ext/secondary ./shell/bootstrap-ocaml.sh $(OCAML_PORT) + 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 index afa9173af3b5..a70a0a9b9c99 100644 --- a/devel/ocaml-opam/files/patch-shell_bootstrap-ocaml.sh +++ b/devel/ocaml-opam/files/patch-shell_bootstrap-ocaml.sh @@ -1,19 +1,11 @@ ---- shell/bootstrap-ocaml.sh.orig 2021-12-07 16:13:53 UTC +--- shell/bootstrap-ocaml.sh.orig 2023-05-27 13:09:27 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 +@@ -42,6 +42,9 @@ mkdir -p ${V} fi cd ${V} +for p in ../../src_ext/ocaml-patches/*.patch; do -+ patch -p1 < $p; ++ patch -p1 < $p; +done; PATH_PREPEND= LIB_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 index feb111b6dbbe..e091694ffe0c 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-Fix-relocation-ocaml-32-bit.patch @@ -1,45 +1,25 @@ ---- 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.orig 2023-05-27 13:17:37 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 ;; +@@ -0,0 +1,22 @@ ++--- a/configure.orig 2023-05-27 13:13:22 UTC +++++ a/configure ++@@ -14070,6 +14070,10 @@ ++ case $CC,$host in #( ++ gcc*,powerpc-*-linux*) : ++ mksharedlib="$CC -shared -mbss-plt \$(LDFLAGS)" ;; #( +++ *,i[3456]86-*) : +++ # Disable DT_TEXTREL warnings on Linux and BSD i386 +++ # See https://github.com/ocaml/ocaml/issues/9800 +++ mksharedlib="$CC -shared \$(LDFLAGS) -Wl,-z,notext" ;; #( ++ *) : ++ mksharedlib="$CC -shared \$(LDFLAGS)" ;; + 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=""]) ++@@ -14281,6 +14285,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*) :