From nobody Sun Nov 3 17:56:26 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 4XhMjQ3fXyz5cXW2; Sun, 03 Nov 2024 17:56:26 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XhMjQ2WZ1z4jtH; Sun, 3 Nov 2024 17:56:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730656586; 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=eSQSph8U/cZOL07Ag7Lr4q3jrwCMkMdRLrBCUvW26gY=; b=I03+0ZKFT4GuiBp7HrRl+j1w002J1gPn8IaK7bqNk8ucApdbaijVUjuIqkpqnAG0iBCQgW WFZITGCxYROUJYSghaqwce99XEHp1kwd3rCh1/mxf38b3d1s6YT+NKCfB5yMjgKoU/81hy aljP2St529Kuu5YLcqHw4jFlafB/PRrPEpB/ieYKyUX9TEuVh0i9JakPhHZRtOBBPtjVSp XR+/CmMei7k6OKoHeGFPepnyKZBKdOATHuwCZ7yTSbq72VBy6fMP3SO7ZQ95W+46105cZP R0G02eLkBaGsUXyl3B1neDpNU9el+dl/phBoh31RyIVoKbP78s7gQ/6CfNgNqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730656586; 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=eSQSph8U/cZOL07Ag7Lr4q3jrwCMkMdRLrBCUvW26gY=; b=MjWiE36OviN/+UhtU3KTrezxMlJa4r8GUBvggm4c0hZVCzWCOACA/dj8h+dQEkafQUm8wq 5ZMVV7vpD1bBgPEsacEIEGbwSL4/Ac/ZOuLEjGBiv6edBmpMY5Va94PZFOOAUUuMXh3dUr OG2yCI8dg45Vmyy4YPsVILecabvWPK/BMLlNpHZKgs3qjI8blBmsOkx0bbN/tzm+LWW102 NXHV46mSUdBgbPqvumjq063Da5PBRdhDciH37WsvV03eNjuzO7nPvGFBdyGc0jatgErISZ DKk2xvX6mJE1X6c9hom92nmuDJA1b220CLIgqquQo3j2i4PHE8r65gpQQ+l2Aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730656586; a=rsa-sha256; cv=none; b=hwVG2pARH4OJPIQ21SkLnqjEUKj9So7jn9VeP+MSnxa4CsHdCqy0KyANNwro6jXnxyWHaq ltZEtooK6/1bzPvWF/kjFDQmFSAjQkNU/vw+GmHmxv/I2HwfK4se6FjvEsx9k9ICrvxPrn +KLoF3AgVrg5fJIslBY7Yry8GcGVn1YM0cgpo+X1GALj2TkCqsDj3JjPYCOPlENuqB22no ebdrWUSXgToUSHHqXGheprF+MdC2lH7xV0a/WTHOlnjAN+tR3XDg6I9yluvih5xPoQOOSh 3eJi4AvYqCZVlqk+jdn0yETN4hLpftQID8GARAD6oNA2mAIX34xG0TZ4o7kNeg== 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 4XhMjQ1qKyzytM; Sun, 3 Nov 2024 17:56:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A3HuQlm022485; Sun, 3 Nov 2024 17:56:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A3HuQns022482; Sun, 3 Nov 2024 17:56:26 GMT (envelope-from git) Date: Sun, 3 Nov 2024 17:56:26 GMT Message-Id: <202411031756.4A3HuQns022482@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 681ab3448b51 - main - science/py-hoomd-blue: Fix build with LLVM 19 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: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 681ab3448b51a925c30d86c9ec698f82f22c4137 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=681ab3448b51a925c30d86c9ec698f82f22c4137 commit 681ab3448b51a925c30d86c9ec698f82f22c4137 Author: Jason E. Hale AuthorDate: 2024-11-03 17:39:32 +0000 Commit: Jason E. Hale CommitDate: 2024-11-03 17:55:10 +0000 science/py-hoomd-blue: Fix build with LLVM 19 Approved by: portmgr (blanket) MFH: 2024Q4 --- science/py-hoomd-blue/Makefile | 2 -- science/py-hoomd-blue/files/patch-hoomd_GPUFlags.h | 18 +++++++++++++ ..._extern_nano-signal-slot_nano__signal__slot.hpp | 30 ++++++++++++++++++++++ 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/science/py-hoomd-blue/Makefile b/science/py-hoomd-blue/Makefile index e7929a59883d..13a2b9fe990f 100644 --- a/science/py-hoomd-blue/Makefile +++ b/science/py-hoomd-blue/Makefile @@ -12,8 +12,6 @@ WWW= https://glotzerlab.engin.umich.edu/hoomd-blue/ \ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_15= compilation fails with clang-19, see https://github.com/glotzerlab/hoomd-blue/issues/1924 - BUILD_DEPENDS= pybind11>0:devel/pybind11 USES= cmake:testing compiler:c++17-lang eigen:3 localbase:ldflags python shebangfix # see https://github.com/glotzerlab/hoomd-blue/issues/1204 diff --git a/science/py-hoomd-blue/files/patch-hoomd_GPUFlags.h b/science/py-hoomd-blue/files/patch-hoomd_GPUFlags.h new file mode 100644 index 000000000000..9b655f55b4af --- /dev/null +++ b/science/py-hoomd-blue/files/patch-hoomd_GPUFlags.h @@ -0,0 +1,18 @@ +Fix build with LLVM 19 + +/wrkdirs/usr/ports/science/py-hoomd-blue/work/hoomd-blue-4.9.0/hoomd/GPUFlags.h:160:27: +error: reference to non-static member function must be called + 160 | this->resetFlags(from.readFlags); + | ~~~~~^~~~~~~~~ + +--- hoomd/GPUFlags.h.orig 2024-10-31 16:09:15 UTC ++++ hoomd/GPUFlags.h +@@ -157,7 +157,7 @@ GPUFlags::GPUFlags(const GPUFlags& from) + memclear(); + + // copy over the data to the new GPUFlags +- this->resetFlags(from.readFlags); ++ this->resetFlags(from.readFlags()); + } + + template GPUFlags& GPUFlags::operator=(const GPUFlags& rhs) diff --git a/science/py-hoomd-blue/files/patch-hoomd_extern_nano-signal-slot_nano__signal__slot.hpp b/science/py-hoomd-blue/files/patch-hoomd_extern_nano-signal-slot_nano__signal__slot.hpp new file mode 100644 index 000000000000..cd3fce241f6d --- /dev/null +++ b/science/py-hoomd-blue/files/patch-hoomd_extern_nano-signal-slot_nano__signal__slot.hpp @@ -0,0 +1,30 @@ +Fix build with LLVM 19 + +/wrkdirs/usr/ports/science/py-hoomd-blue/work/hoomd-blue-4.9.0/hoomd/extern/nano-signal-slot/nano_signal_slot.hpp:46:45: +error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] + 46 | Observer::insert(Delegate::template bind (instance), this); + | ^ +/wrkdirs/usr/ports/science/py-hoomd-blue/work/hoomd-blue-4.9.0/hoomd/extern/nano-signal-slot/nano_signal_slot.hpp:87:45: +error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] + 87 | Observer::remove(Delegate::template bind (instance), this); + +--- hoomd/extern/nano-signal-slot/nano_signal_slot.hpp.orig 2016-07-13 20:06:52 UTC ++++ hoomd/extern/nano-signal-slot/nano_signal_slot.hpp +@@ -43,7 +43,7 @@ class Signal : private Observer + template + void connect(L* instance) + { +- Observer::insert(Delegate::template bind (instance), this); ++ Observer::insert(Delegate::bind (instance), this); + } + template + void connect(L& instance) +@@ -84,7 +84,7 @@ class Signal : private Observer + template + void disconnect(L* instance) + { +- Observer::remove(Delegate::template bind (instance), this); ++ Observer::remove(Delegate::bind (instance), this); + } + template + void disconnect(L& instance)