From nobody Sat May 04 13:32:05 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 4VWpVt1FgHz5KZC2; Sat, 4 May 2024 13:32:06 +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 4VWpVt0ZdKz4HRP; Sat, 4 May 2024 13:32:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714829526; 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=e+9PPNexSdm4nvfoPO8hmS2boWE+Ojs4XHk8Nb3izf4=; b=uXrOVE/8nhGxllwiSUgV3ocjtfX/7ELVaWQZRq11GQXTXur/e4FiCjG94IJMzZDk0aJlkc TKj6yGqQ0+d1yNLHzGPNC+hFz+rnPhsOjSFDX7VOjuRW6SorPBBOnLZ0UCxbVXncWAtykc HNc+Pigun48a8b0yD3cDXOG5nw4Lgr/KGJylrLVb1no1ux9Ti7wBDNnhxe7YdU7FeOItGk BM6JEcimMOU+mFAM1dQgNgvEcir7z7MBMXdyK1uHsbig1XuEKN+Ty8iCrqIAm+JFXFYfJi sQ99kgTOYbiOMEsVjZj0FbpZcZQBMwcz99C/vzTE3DKQqEvr3582Ewty5Ey0Yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714829526; a=rsa-sha256; cv=none; b=NiSBIBhv9Eh1eL2OpE9VKlSTcPdACTijQ5ZDfvd8xCKiu7qWq/yRAHKU62bE3dkNvKVt+o BBVAW2QXZUdsclJPmqE6M7pUfebeCDO/tKShzpMoEgAfE4rsWAFxyYgnIQkNDohlin+cSG sI0SuVk6rJxwQLhrjr952JQQbJa3t7Wz+4qw3sDxZcr6jS3OuJZVGXi5v4+282Mo4qfbBF n87ENL9eylAuezrWBeMDSvR4aBJiNoHaf7A7OWyxlspEGp3m7dGqG66lSFKzy3REjis0lp 3SHCy1tW16M2LU7YN786IZoXmRQVkGwjXti28y/aOCyYRFi1UFdhYXlay2Xipw== 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=1714829526; 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=e+9PPNexSdm4nvfoPO8hmS2boWE+Ojs4XHk8Nb3izf4=; b=KVw9DpYo48lENCVfmpgt9KIq9fObLdG+ZcNvytvAk34MpaWtqSSQiZu+pJLwgloBe0P2J0 HDsh5ytXWnp0iX2WWBime33SYxtjShjdbU8c2zJux2QloNZikVi++TLYI9SRYDqCE36CRp BtGJNWj1r6AV4bkiZxK7shoXC64/SCWdmxAnKkXCbA1Knih/9JfTKkAfACe1RhDD0vV/BM yo8wxHEO3+y40C1//08yRalZC+C47MuEOoDC8AOuRFvA3bOzSmf3n8e+HYt0qVyts2kbw3 E2B2UJV7WWoJ5cq0+FHkvC/PeuFCcAvgZkbbhWnEQopCAdKe6uAM0VJbDr4clA== 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 4VWpVt08vBzXrL; Sat, 4 May 2024 13:32:06 +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 444DW5ii074706; Sat, 4 May 2024 13:32:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 444DW5jq074703; Sat, 4 May 2024 13:32:05 GMT (envelope-from git) Date: Sat, 4 May 2024 13:32:05 GMT Message-Id: <202405041332.444DW5jq074703@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: d05586213892 - main - math/sprng: fix build with clang 18 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d05586213892764617a96edec7151b464b1906ff Auto-Submitted: auto-generated The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=d05586213892764617a96edec7151b464b1906ff commit d05586213892764617a96edec7151b464b1906ff Author: Thierry Thomas AuthorDate: 2024-05-04 13:21:44 +0000 Commit: Thierry Thomas CommitDate: 2024-05-04 13:32:02 +0000 math/sprng: fix build with clang 18 This is not a bug of clang. Patch suggested by dim@. PR: 278711 --- math/sprng/files/patch-TESTS_mpitests_wolff.cpp | 37 +++++++++++++++++++++++++ math/sprng/files/patch-TESTS_wolff.cpp | 37 +++++++++++++++++++++++++ math/sprng/files/patch-TESTS_wolfftest.cpp | 37 +++++++++++++++++++++++++ 3 files changed, 111 insertions(+) diff --git a/math/sprng/files/patch-TESTS_mpitests_wolff.cpp b/math/sprng/files/patch-TESTS_mpitests_wolff.cpp new file mode 100644 index 000000000000..30e2f0d3ecda --- /dev/null +++ b/math/sprng/files/patch-TESTS_mpitests_wolff.cpp @@ -0,0 +1,37 @@ +--- TESTS/mpitests/wolff.cpp.orig 2011-08-06 15:58:22 UTC ++++ TESTS/mpitests/wolff.cpp +@@ -14,7 +14,7 @@ using namespace std; + + /*#define PARALLEL*/ + +-int lattice_size, *spin, *stack, nsites; ++int lattice_size, *spin, *my_stack, nsites; + Sprng **genptr; /* array of random number generators */ + int exponent, mask; /* Used for efficiency purposes */ + double prob; +@@ -73,12 +73,12 @@ void Single_Cluster_Update(void) /* update lattice spi + if (genptr[i]->sprng() > prob) + continue; + spin[nnJ]=-spin[nnJ]; +- stack[++Ipt]=nnJ; ++ my_stack[++Ipt]=nnJ; + } + + if(Ipt>=0) + { +- i=stack[Ipt]; ++ i=my_stack[Ipt]; + Ipt--; + } + else i=-1; +@@ -216,8 +216,8 @@ void minitialize(int rng_type, int seed, int param, in + + + spin = static_cast(malloc(nsites*sizeof(int))); +- stack = static_cast(malloc(nsites*sizeof(int))); +- if(!spin || !stack) ++ my_stack = static_cast(malloc(nsites*sizeof(int))); ++ if(!spin || !my_stack) + { + printf("\n\tMemory allocation failure, program exits!\n"); + exit(-1); diff --git a/math/sprng/files/patch-TESTS_wolff.cpp b/math/sprng/files/patch-TESTS_wolff.cpp new file mode 100644 index 000000000000..7b5fcda07c83 --- /dev/null +++ b/math/sprng/files/patch-TESTS_wolff.cpp @@ -0,0 +1,37 @@ +--- TESTS/wolff.cpp.orig 2011-08-06 15:58:04 UTC ++++ TESTS/wolff.cpp +@@ -14,7 +14,7 @@ using namespace std; + + /*#define PARALLEL*/ + +-int lattice_size, *spin, *stack, nsites; ++int lattice_size, *spin, *my_stack, nsites; + Sprng **genptr; /* array of random number generators */ + int exponent, mask; /* Used for efficiency purposes */ + double prob; +@@ -73,12 +73,12 @@ void Single_Cluster_Update(void) /* update lattice spi + if (genptr[i]->sprng() > prob) + continue; + spin[nnJ]=-spin[nnJ]; +- stack[++Ipt]=nnJ; ++ my_stack[++Ipt]=nnJ; + } + + if(Ipt>=0) + { +- i=stack[Ipt]; ++ i=my_stack[Ipt]; + Ipt--; + } + else i=-1; +@@ -216,8 +216,8 @@ void minitialize(int rng_type, int seed, int param, in + + + spin = static_cast(malloc(nsites*sizeof(int))); +- stack = static_cast(malloc(nsites*sizeof(int))); +- if(!spin || !stack) ++ my_stack = static_cast(malloc(nsites*sizeof(int))); ++ if(!spin || !my_stack) + { + printf("\n\tMemory allocation failure, program exits!\n"); + exit(-1); diff --git a/math/sprng/files/patch-TESTS_wolfftest.cpp b/math/sprng/files/patch-TESTS_wolfftest.cpp new file mode 100644 index 000000000000..dc897c35383e --- /dev/null +++ b/math/sprng/files/patch-TESTS_wolfftest.cpp @@ -0,0 +1,37 @@ +--- TESTS/wolfftest.cpp.orig 2009-06-13 21:46:10 UTC ++++ TESTS/wolfftest.cpp +@@ -14,7 +14,7 @@ using namespace std; + + /*#define PARALLEL*/ + +-int lattice_size, *spin, *stack, nsites; ++int lattice_size, *spin, *my_stack, nsites; + Sprng **genptr; /* array of random number generators */ + int exponent, mask; /* Used for efficiency purposes */ + double prob; +@@ -74,12 +74,12 @@ void Single_Cluster_Update(void) /* update lattice spi + if (genptr[i]->sprng() > prob) + continue; + spin[nnJ]=-spin[nnJ]; +- stack[++Ipt]=nnJ; ++ my_stack[++Ipt]=nnJ; + } + + if(Ipt>=0) + { +- i=stack[Ipt]; ++ i=my_stack[Ipt]; + Ipt--; + } + else i=-1; +@@ -217,8 +217,8 @@ void minitialize(int rng_type, int seed, int param, in + + + spin = static_cast(malloc(nsites*sizeof(int))); +- stack = static_cast(malloc(nsites*sizeof(int))); +- if(!spin || !stack) ++ my_stack = static_cast(malloc(nsites*sizeof(int))); ++ if(!spin || !my_stack) + { + printf("\n\tMemory allocation failure, program exits!\n"); + exit(-1);