From nobody Sat May 18 14:00:14 2024 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 4VhQSt47Hgz5KqkX; Sat, 18 May 2024 14:00:14 +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 4VhQSt3cPYz56LF; Sat, 18 May 2024 14:00:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716040814; 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=qLpo9ua2E34On22rzZImaA7Fz07Dd22jedy8LUxGOzI=; b=vaEREIfnhOzjjDI/mHEKOrc4pyOY/KMDE2Rs/tTB+8L52OJW2q2Krxp98e5VRCr4R7MvoC Ao8HnWoW9VOOZivr6iae6GLWY7UdHFGpziD8uwf0+jODva/2Jv2HBuz86T4lr18Jel/mR1 /8cDzHrJ7X5H3cNNGW6YvOv685cgZGnj6yxLnDEYL4DAkNcofotxj38+kSLLt46e4+k+tp ABhgcckWcdj8RW4UMA756VUUQfsMdChhdVo1BmdkoMYyBEEDb/rSpb5gtOUvFjwRU48U0G ebW1E+6x1TgeU8+0AASXJOQLw9ziAYhS6IyN/MU4eaBSYx0sKgjO6OY0d0JOTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716040814; a=rsa-sha256; cv=none; b=Fv6dckvquIl3FbB8O5TbQHION0Du0Q/gw8E284G5HUAVJF0vNeRhVaJ7ED0x9Tw86d8fWz dBI9LK2djMy1V5yr9qB6mZa2og2ZnVaYCHY+4BNTon5AwgigpRNe7lGJHK6F6Q8D4nqpCh h6BtFRYRKYar3KuPm0seqJGjIkalnofrN7jeI3zV6ZsUWWNsoY9ZIUz0xC/JK6byJAax+Q CFWW9jsJb4BOuhYU2I5zec5w4e50Zi+WyP3FGEQwOtRd0fTcD+FSxgmeulEM7OK+R8xL2t jaxL21f0hhqQv4K0lnr8RKjfmIPHTTiWkHKDfNTaDYHaw8HOVQpDUBftnVxvqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716040814; 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=qLpo9ua2E34On22rzZImaA7Fz07Dd22jedy8LUxGOzI=; b=xwrIDMYi0rWLe+JSSP4FhnRE34r5ZqtGu66MHOcRCwsTBRUl8R1SFrdhEEdGdRyGAZyeeN l6h7XSTvDux1P59jSEmVAHoPHZSsHdYNAlTiXADsy9fvef/CAvd19SkNjMxnqQGUXliqjd Jo8hDbR7EjbmeSi0S/YT5+FZ2r3sONGnxElkWdvK3FrjW+bQP96Vh7m7CUrr/ul/X36RZ6 PKvAUB0NTOwQ767scs00Yoa4qjRcUnc34l88HLX1I8POT1U5F8sirHr8uqYAzUVRRvZuPh cdbrnC6X6tHVX0zkT6pauSSQSdxBCE1jLVYabUEFtgneW/WEV+z/D6U7kTGlVQ== 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 4VhQSt2v8SzStP; Sat, 18 May 2024 14:00:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44IE0Et1070531; Sat, 18 May 2024 14:00:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44IE0E1M070519; Sat, 18 May 2024 14:00:14 GMT (envelope-from git) Date: Sat, 18 May 2024 14:00:14 GMT Message-Id: <202405181400.44IE0E1M070519@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 823ece70ac67 - main - devel/ocaml-opam: Update to 2.1.6 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 823ece70ac6733aaee83ae2fbfd5829e6e843657 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=823ece70ac6733aaee83ae2fbfd5829e6e843657 commit 823ece70ac6733aaee83ae2fbfd5829e6e843657 Author: Hannes Mehnert AuthorDate: 2024-05-18 13:58:52 +0000 Commit: Li-Wen Hsu CommitDate: 2024-05-18 13:58:52 +0000 devel/ocaml-opam: Update to 2.1.6 Changelog at https://github.com/ocaml/opam/releases/tag/2.1.6 PR: 279041 --- devel/ocaml-opam/Makefile | 10 ++++------ devel/ocaml-opam/distinfo | 6 +++--- ...ocaml-patches_0001-Fix-relocation-ocaml-32-bit.patch | 17 +++-------------- 3 files changed, 10 insertions(+), 23 deletions(-) diff --git a/devel/ocaml-opam/Makefile b/devel/ocaml-opam/Makefile index c304d6169d1e..6ee5fe018b62 100644 --- a/devel/ocaml-opam/Makefile +++ b/devel/ocaml-opam/Makefile @@ -1,6 +1,5 @@ PORTNAME= opam -DISTVERSION= 2.1.5 -PORTREVISION= 3 +DISTVERSION= 2.1.6 CATEGORIES= devel MASTER_SITES= https://github.com/ocaml/opam/releases/download/${DISTVERSION}/ PKGNAMEPREFIX= ocaml- @@ -14,14 +13,12 @@ LICENSE= LGPL21 RUN_DEPENDS= curl:ftp/curl \ gpatch:devel/patch \ - gmake:devel/gmake \ - ${RUN_DEPENDS_${ARCH}} -RUN_DEPENDS_armv6= ${LOCALBASE}/bin/as:devel/binutils -RUN_DEPENDS_armv7= ${LOCALBASE}/bin/as:devel/binutils + gmake:devel/gmake USES= gmake ARCH!= uname -p .if ${ARCH} == armv6 || ${ARCH} == armv7 +RUN_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils USE_BINUTILS= yes .endif @@ -35,6 +32,7 @@ ALL_TARGET= cold-lib-ext cold-all LDFLAGS_armv6= -Wl,-z,notext LDFLAGS_armv7= -Wl,-z,notext LDFLAGS_powerpc= -Wl,-z,notext +LDFLAGS_i386= -Wl,-z,notext LDFLAGS+= ${LDFLAGS_${ARCH}} NOPRECIOUSMAKEVARS= yes diff --git a/devel/ocaml-opam/distinfo b/devel/ocaml-opam/distinfo index b31e09268ad9..4b15d663b0ad 100644 --- a/devel/ocaml-opam/distinfo +++ b/devel/ocaml-opam/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685599850 -SHA256 (opam-full-2.1.5.tar.gz) = 09f8d9e410b2f5723c2bfedbf7970e3b305f5017895fcd91759f05e753ddcea5 -SIZE (opam-full-2.1.5.tar.gz) = 10801367 +TIMESTAMP = 1715883550 +SHA256 (opam-full-2.1.6.tar.gz) = d2af5edc85f552e0cf5ec0ddcc949d94f2dc550dc5df595174a06a4eaf8af628 +SIZE (opam-full-2.1.6.tar.gz) = 11704198 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 d80febb53acc..23e6f41d0a99 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,20 +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 -@@ -0,0 +1,43 @@ +@@ -0,0 +1,32 @@ +--- 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 -+@@ -14256,12 +14260,20 @@ case $host in #( ++@@ -14256,12 +14256,20 @@ case $host in #( + arch=amd64; system=win64 ;; #( + powerpc64le*-*-linux*) : + arch=power; model=ppc64le; system=elf ;; #( @@ -35,7 +24,7 @@ + s390x*-*-linux*) : + arch=s390x; model=z10; system=elf ;; #( + # expected to match "gnueabihf" as well as "musleabihf" -+@@ -14281,6 +14285,8 @@ ++@@ -14281,6 +14289,8 @@ + arch=arm; model=armv6; system=linux_eabi ;; #( + armv6*-*-freebsd*) : + arch=arm; model=armv6; system=freebsd ;; #(