From nobody Fri Jun 30 12:01:17 2023 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 4Qsv6k03zvz4l14C; Fri, 30 Jun 2023 12:01:18 +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 4Qsv6j6lRTz49Kx; Fri, 30 Jun 2023 12:01:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688126477; 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=oau+PfjnIu030HvgPrEyx4QFIbUaJxosD2kXUH9ybI8=; b=il8zUI8QXVeZspLfYk8H3B93GvGyFvOjT/mPO+y1kSzDsBfweTNfFWg2UonOrFAZFXlAxO sdAXmcRkIPRqjo5Jxw3043/1WS0lFZxMh0oN7bRkTAOduKrdxD2nfcnbc/a9PSHIMms9kz OC4MoMKM3UsyKLD4SK6Dq8GX4rGzeCxX1QmvMlrbRUBr85Yk/btjVvQVTjrBWDvGuivnOC dyA09Rf0RBilSJ9ew7NS0ba3aL/Onh1WDXMEWm1Q3BcLnz40+/xLzWmyNPxy5MHYamPMAE QwUcIgQfC4GZqwAVJjAa9eOBDxizUHVN10udcm7zjpb4FlIkly1cyGoxej5x7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688126477; 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=oau+PfjnIu030HvgPrEyx4QFIbUaJxosD2kXUH9ybI8=; b=FkrcA90P/vfK0W26dvp7It73z38Odp4jK/3Urj/d5idnd5CZL6m8+TFN0jHZP8F0kb7KDD nHfzwYI40yZXP7glRtOV5oTegF800Rg1afgxID2ZCZ8BI/7A7JnhYx/kLe+Fkmg93IHSBx PWXQrJyElJi6rAm6WFFH/dlpVy/Mseeoqsc/wX6dXIjydMFel03LoY1CgU3eLbM/E6AWB1 nibEWXm8HHnPG5GGK/hhYSvOlLK6aDJYgA0PBpdmiuzI2y+10pGSbgRo0ukM/7rhtyb029 89kvBpdRLjAVkAsmQ8yjm7I8vjRsfjqOgIACKOwDBX6kNr8kSKBNrSnGaIw7ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688126477; a=rsa-sha256; cv=none; b=ZaBYt0xEEVAM1Dt4uvynLR4kD+9NAYwRB6MdHgQX7EZ8UhgrmoOg3Zz2AXhY/9JHAA5px2 TvDwsBQM8gDQN10S2PIdSMNorA+GPbzD8rGSG1mYvComDfmfPY/gug3ArSMjqqpD9oMeCk P7nfw3n9PqswFcP9hn06nnDip2wAWCq4xABdz60gcK14mV1OVggHiFDohq6U2KQtVsrXVx fA+W7/QqNVN4kCv9APLmO1WoHe40do8SNV3GulAj3OE/v9vuO80Qc0QUd0mDqD22LzBfzM z8YmUWYI6xOlFKiaDFiGGFw+yy9GWt52N9lNxj33XsgLapY4R9gIsQBxKDCK+g== 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 4Qsv6j5rZjzxxK; Fri, 30 Jun 2023 12:01:17 +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 35UC1H01044544; Fri, 30 Jun 2023 12:01:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35UC1HGG044543; Fri, 30 Jun 2023 12:01:17 GMT (envelope-from git) Date: Fri, 30 Jun 2023 12:01:17 GMT Message-Id: <202306301201.35UC1HGG044543@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: b27d05a94c64 - main - biology/hyphy: fix build on armv7 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: owner-dev-commits-ports-main@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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b27d05a94c645a3ba02c50122a229c37bec42559 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=b27d05a94c645a3ba02c50122a229c37bec42559 commit b27d05a94c645a3ba02c50122a229c37bec42559 Author: Robert Clausecker AuthorDate: 2023-06-29 08:33:12 +0000 Commit: Robert Clausecker CommitDate: 2023-06-30 12:00:28 +0000 biology/hyphy: fix build on armv7 With OpenMP not present, the code had a duplicate function definition. Get rid of one of the two to enable a build on armv7. Approved by: portmgr (build fix blanket) --- biology/hyphy/files/patch-src_core_include_likefunc.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/biology/hyphy/files/patch-src_core_include_likefunc.h b/biology/hyphy/files/patch-src_core_include_likefunc.h new file mode 100644 index 000000000000..bd2ab76cc7cb --- /dev/null +++ b/biology/hyphy/files/patch-src_core_include_likefunc.h @@ -0,0 +1,12 @@ +--- src/core/include/likefunc.h.orig 2023-06-27 12:50:39 UTC ++++ src/core/include/likefunc.h +@@ -282,9 +282,6 @@ class _LikelihoodFunction: public BaseObj { (public) + long GetThreadCount (void) { + return 1L; + } +- void SetThreadCount (long) { +- +- } + #endif + #endif +