From nobody Wed Dec 11 17:34:12 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 4Y7jQF09gmz5gDQv; Wed, 11 Dec 2024 17:34:13 +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 4Y7jQD57yFz4J0n; Wed, 11 Dec 2024 17:34:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733938452; 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=Sdi0ru2Gex82agnoRXQoo+y5G25e6QnxVkPbO4md6ZQ=; b=WZMsI9xuGrAuXuLQvyTDRwsPM87pGN+EW0w6PKmKO8uRuKLlr35PhVqGslXGIzVov9chr7 1B1JDiMM9Vj8PVAwjq0kSxsOt2T3Zm5NlirsClhk7l9aHRqiQxGhGx1VLGif8PgmAb6g24 zGmAM3naqOI9zXGPQLmp5U+el/vU++nl4NtykKb8MPgaFcKoNouMDE1SldvF2ReYui/PVi 3v8H2rOmRdIK82vFuJdKPkl/JrrVN79FANlfPStrHuIse4WVAXqrlDU1YQPlaK1c+z74oO PEYj9iR4BJJ3JK4RFID5BgIRt/UoeZ1xewZFGalLjNnC2PEAtIWuaRML5GyX9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733938452; 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=Sdi0ru2Gex82agnoRXQoo+y5G25e6QnxVkPbO4md6ZQ=; b=uzH6y0IEiWmKHAwDkhHYtpKPIE7Ct0qHhoFUZl17Wt9xNJcWy9bPBDLq6Z9W7EuyeC74zT YrmZn55g6R1GKVmFE8i7wIeEBEY4Ne8HUmGyBj3Wk0O2CoYbq7iejHmpe+L7apvwYwTtBh LL0dcDMfMOp4tcF4nsJjw9WKC3Ck3q8mzuzI1iM3DRtIp5bgC4hBuvaV1DU8IwUMr1zfgh wqiMpXJv34k8mwe/cD3XvDiaXBOa0mGerkd4vA7uTMxSkIZueog9poxGSLnBRCs9gDroBO H5XRKH6QbZ+W8HM3mblycCM8edt8Fww0+pKlAyYWtwEF6TVOAFlm7Mze0v/oZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733938452; a=rsa-sha256; cv=none; b=rJDe9o0jb93+qcNANGHvJuCLaFQavY8pqmRaFMzrV+SAxitQyMtE+5+MBmjSGKoanCLrvf yhIXwl4OZYdAMfZeAUwLXG0KIgZQDOun8wUv1oNHNyt76B+WIQtzVDJD7+eZhnqoq09mt1 570nmBi+LzpkSwDqwzU5V5EoXARSzSd//Op2gxWe4zyWyprWDc30sfr6bWuvM1Ea0EVSie 8nSrPF5cVp4LNG/qEKt9CvUwICyeJ/K7s6f+uGHp3y0nBJn0OwPvM3ePH5K/40VX+jCmRG gW/uu6J9Iy/DxFr78QXtoPY8SqxWhEKwt/uRLAMuEqTCRqT0v/BIpPEl1tMWaQ== 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 4Y7jQD4hTGzHPd; Wed, 11 Dec 2024 17:34:12 +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 4BBHYCcj029302; Wed, 11 Dec 2024 17:34:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BBHYCEP029299; Wed, 11 Dec 2024 17:34:12 GMT (envelope-from git) Date: Wed, 11 Dec 2024 17:34:12 GMT Message-Id: <202412111734.4BBHYCEP029299@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: 440dfcc986d1 - main - biology/seqwish: disable march=native, fixing build on non-x86 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 440dfcc986d1b3e205cfc758956a646f1719eeca Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=440dfcc986d1b3e205cfc758956a646f1719eeca commit 440dfcc986d1b3e205cfc758956a646f1719eeca Author: Piotr Kubaj AuthorDate: 2024-12-11 13:37:31 +0000 Commit: Piotr Kubaj CommitDate: 2024-12-11 17:29:07 +0000 biology/seqwish: disable march=native, fixing build on non-x86 Contrary to the removed comment, it doesn't break compilation, tested on amd64. --- biology/seqwish/Makefile | 3 ++- .../seqwish/files/patch-deps_paryfor_paryfor.hpp | 25 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/biology/seqwish/Makefile b/biology/seqwish/Makefile index a00135305a4b..0bbf8c64b169 100644 --- a/biology/seqwish/Makefile +++ b/biology/seqwish/Makefile @@ -1,6 +1,7 @@ PORTNAME= seqwish DISTVERSIONPREFIX= v DISTVERSION= 0.7.11 +PORTREVISION= 1 CATEGORIES= biology MASTER_SITES= https://github.com/ekg/seqwish/releases/download/v${DISTVERSION}/ @@ -16,7 +17,7 @@ BROKEN_i386= compilation fails: error: use of undeclared identifier '_pdep_u64' USES= cmake:noninja compiler:c++14-lang -#CMAKE_ARGS= -DEXTRA_FLAGS="" # disable -march=native ; this causes the link failure: undefined symbol: __sync_val_compare_and_swap_16, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=274927 +CMAKE_ARGS= -DEXTRA_FLAGS="" # disable -march=native PLIST_FILES= bin/${PORTNAME} diff --git a/biology/seqwish/files/patch-deps_paryfor_paryfor.hpp b/biology/seqwish/files/patch-deps_paryfor_paryfor.hpp new file mode 100644 index 000000000000..c8a0fc7b928d --- /dev/null +++ b/biology/seqwish/files/patch-deps_paryfor_paryfor.hpp @@ -0,0 +1,25 @@ +--- deps/paryfor/paryfor.hpp.orig 2024-10-15 18:25:21 UTC ++++ deps/paryfor/paryfor.hpp +@@ -51,7 +51,22 @@ static inline void spin_loop_pause() noexcept { + } + } // namespace atomic_queue + } // namespace paryfor ++#elif defined(__ppc64__) || defined(__powerpc64__) ++namespace paryfor { ++namespace atomic_queue { ++constexpr int CACHE_LINE_SIZE = 128; // TODO: Review that this is the correct value. ++static inline void spin_loop_pause() noexcept { ++ asm volatile("or 31,31,31 # very low priority"); // TODO: Review and benchmark that this is the right instruction. ++} ++} // namespace atomic_queue ++} // namespace paryfor + #else ++namespace paryfor { ++namespace atomic_queue { ++constexpr int CACHE_LINE_SIZE = 64; // TODO: Review that this is the correct value. ++static inline void spin_loop_pause() noexcept {} ++} // namespace atomic_queue ++} // namespace paryfor + #error "Unknown CPU architecture." + #endif +