From nobody Wed Apr 10 09:32:47 2024 X-Original-To: dev-commits-ports-main@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 4VDyKr0X66z5GlDJ; Wed, 10 Apr 2024 09:32:48 +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 4VDyKq6wrTz44wr; Wed, 10 Apr 2024 09:32:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712741568; 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=vo0zzJmDKldqjRN4NKmW7h+fPztFenwsJTur+8lDOAc=; b=KUS0MqjSJWnecjNYNnKd8DFqpmoL2D1KDp8mKDYKLyt9B4H3jdlKUC78HRc252CK1jz8XP nk4iI/nSqNRz1LPUrNBDSWlPfptfhqmrHlTB1qdyRQTpjMyadEh044IUGSEgnF81BG1xX0 r4OwCIiBsaA3Pyn9T/1vuSFRPp9CYGA6p75CpYBmFw/TUkR5xpImQ1uz5tmxN1xxqP9F8v MILOfwbhgAiU6kYO4VwHbA8huXwiuW1X10eaR+fgxDdKh5jJLAHRDaqRVEw5fl+meSZvlB PuqAY2NYxf54bEYHBT5DrdbyWxcodJdmAZ2t4vtqPObqx24vV5AgO3iy+5LGPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712741568; a=rsa-sha256; cv=none; b=ArACSO0RZRwodgX6yn4Aw3Dnd2msPxDsIkO35MVP1Ej+e6HnZIDgogQgUeGZpDkYkdnj+d cHPjnGO6HnWdw9WrnfAGLiF1iyOG3XCCrCseyfFbtzktMcEDMmYnISkAtazdcKScVf45fx MDB/PHbb0rbvMLW7mEFXzPgTkwm6MzxQx6RlUYi3c95lDAiBc2c7ywmDFkTsDdtmJLeDK9 VuefCxEAPlC2r6G8u7d/aUL0GMlAivTeCxJpdUBk2GJljtKT6E3YFX+I9BO0zz5zRskc57 PEcQ5Anp2mEFpTyYEblZo4mt/T/emVtPgZfNq+epsbVTt0JLmLPVJhks6FKTrQ== 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=1712741568; 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=vo0zzJmDKldqjRN4NKmW7h+fPztFenwsJTur+8lDOAc=; b=euyMLXkxfB9e4NMKf2xRy7Z6cZGi3XGFyW563lDvKSpD9ynHQ4Wu4df8jcJAgDYMQyL6fA VSQdNmmYMkNLR7dE0+dzLyMOaWSCS/bS3VsCLmMmyXfHj41wZ6lwH/YxNVesWLD9abI5ja rqlwcX32BGDF5On8BmJe1d2t9ZteHjG7qhe4/yw7dhjwMFrKJQ85e2iRDnvglMIPHN8yCU 0f/6xD7q1rMRdW4zPpEvbNEo7kuE8Zemr7Zvxle9BYnn5Zqxei2YgebzFqNyFa6cURK9Ed ZdG/2wF2eC4JcrrSG47ZEBzT+Y5aeRLJoY5Phswb8nIcuNgud6Qn8JRlK7Cr8g== 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 4VDyKq6X6lzYby; Wed, 10 Apr 2024 09:32:47 +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 43A9WlN6014933; Wed, 10 Apr 2024 09:32:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43A9WluC014930; Wed, 10 Apr 2024 09:32:47 GMT (envelope-from git) Date: Wed, 10 Apr 2024 09:32:47 GMT Message-Id: <202404100932.43A9WluC014930@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 60e407ed3ad3 - main - lang/ocaml: fix build on powerpc* List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: dev-commits-ports-main+owner@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 60e407ed3ad3fbd45c42272ef8f68b080a429408 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=60e407ed3ad3fbd45c42272ef8f68b080a429408 commit 60e407ed3ad3fbd45c42272ef8f68b080a429408 Author: Piotr Kubaj AuthorDate: 2024-04-10 09:30:49 +0000 Commit: Piotr Kubaj CommitDate: 2024-04-10 09:32:25 +0000 lang/ocaml: fix build on powerpc* --- lang/ocaml/files/patch-configure | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/lang/ocaml/files/patch-configure b/lang/ocaml/files/patch-configure index 5f1b980257d6..a1ac679f1a16 100644 --- a/lang/ocaml/files/patch-configure +++ b/lang/ocaml/files/patch-configure @@ -1,6 +1,15 @@ --- configure.orig 2022-12-20 12:26:44 UTC +++ configure -@@ -14169,10 +14169,14 @@ if test x"$supports_shared_libraries" = 'xtrue'; then +@@ -14161,6 +14161,8 @@ if test x"$supports_shared_libraries" = 'xtrue'; then + natdynlink=true ;; #( + powerpc*-*-linux*) : + natdynlink=true ;; #( ++ powerpc*-*-freebsd*) : ++ natdynlink=true ;; #( + x86_64-*-solaris*) : + natdynlink=true ;; #( + i686-*-kfreebsd*) : +@@ -14169,10 +14171,14 @@ if test x"$supports_shared_libraries" = 'xtrue'; then natdynlink=true ;; #( x86_64-*-dragonfly*) : natdynlink=true ;; #( @@ -17,7 +26,28 @@ i[3456]86-*-openbsd*) : natdynlink=true ;; #( x86_64-*-openbsd*) : -@@ -14338,6 +14342,8 @@ fi; system=elf ;; #( +@@ -14313,12 +14319,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" +@@ -14338,6 +14352,8 @@ fi; system=elf ;; #( arch=arm; model=armv6; system=linux_eabi ;; #( armv6*-*-freebsd*) : arch=arm; model=armv6; system=freebsd ;; #( @@ -26,7 +56,7 @@ earmv6*-*-netbsd*) : arch=arm; model=armv6; system=netbsd ;; #( earmv7*-*-netbsd*) : -@@ -14362,7 +14368,7 @@ fi; system=elf ;; #( +@@ -14362,7 +14378,7 @@ fi; system=elf ;; #( arch=amd64; system=dragonfly ;; #( x86_64-*-solaris*) : arch=amd64; system=solaris ;; #(