From nobody Fri Oct 11 17:36:20 2024 X-Original-To: dev-commits-ports-branches@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 4XQDLr6tMDz5Z9LB; Fri, 11 Oct 2024 17:36:20 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQDLr6Cwzz3x1L; Fri, 11 Oct 2024 17:36:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728668180; 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=5VfaRaGRTdaalvMfYgDATMqPLim7yGjC9tkkge/ewJA=; b=pMKL219B7edLXqku+ii8lCwimbvIaEGsRzX7+cal13HwmlThaWhbN15xB1PgvoSJ1xEL98 QUDaDFE68fEAWKwV3X7aFYkSxYnAUg5Hr3+Hui5BXQnVgIJINRKmeoRySAjT4YPZTsFK/z dWE6gBUQVMxwQu9wKiV//bf1ZqXDjpo2MSmxE5AAzrdHNnknt3j/ztyVBjZy3Iu1XoVUgk AFxSY9xgE8SVzH71qTVuNNN5o0fUK/4MDFGLIjI+qDz4c91sNo/FkAvIJaueb8o+4OCuFe 0yDuQUu3ZhiLxaC4cmWWZqlbyQMGPOYzkl/30Qs731U5BGxw5wzAtB6IjIL9Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728668180; 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=5VfaRaGRTdaalvMfYgDATMqPLim7yGjC9tkkge/ewJA=; b=vR8KwrC5sB8z+ZDUHHICYlnj8vlkfTO3ZC2HpnB+Zz5Z9VJV9gfJE9sh0j7q0cAPlnitOh hFEItyx15gbj2M3QRraLxJy2Sm3WwSbNY6egyxvBarhrClNYqUIdLfNan1AZwPE0puH3j5 2Q7yvbvrH5nK0SlAha8oW1BsTWqwgT4qVch5LHbpTsBbIocthh+ThJqMjZU1gWZfUkUQPi kRIHBu2jib/DftASGPBQxttWqsyjZE0aXLGWIaKcgNzKgioyv1yez1s784Eo/bY3QJfpxg usxHucTAlm3+dtV3KeaxY8LyNvLUZbkPkEjAA2dSpVRyp/8ePr0rb9bUpkW7lA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728668180; a=rsa-sha256; cv=none; b=rwpZkGrn4BC4L71IjH8iDPwuoFJeVgFWAi6ZoKGQ8AbllJzHHXXVvTd1XF+CF2Zl7s3CGT 7nLjL1CBFFvnr9Khtb0xpo8Wtmq6cPx7lSUwkx+HvFQ3ooTLRhPK2qCoSDfcOshsKDhOX8 P4xfBYtS9yy6NQdbDBaH65MqmzdNEyAQ98ezXcsmOjhfzCl0MQTkLUxkh9mvCilFI0GbOY fcM4EPAVood8+nVoSW3sE6MPnagC7ez9EWntf658zhlt498VUnytFgO6Ey8ORgO8JYqsJ8 lrsEA4FvGvUKVm2ug++XdiONBPG8Anfv17D056Xon2yzu6BR8y708Kgg9fIsaQ== 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 4XQDLr5nzQzrbb; Fri, 11 Oct 2024 17:36:20 +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 49BHaK52059812; Fri, 11 Oct 2024 17:36:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BHaKGA059809; Fri, 11 Oct 2024 17:36:20 GMT (envelope-from git) Date: Fri, 11 Oct 2024 17:36:20 GMT Message-Id: <202410111736.49BHaKGA059809@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dimitry Andric Subject: git: 9e3c846ca055 - 2024Q4 - biology/biosig: fix build with libc++ 19 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q4 X-Git-Reftype: branch X-Git-Commit: 9e3c846ca05513deb6908fb41598bfdcc52b30c1 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=9e3c846ca05513deb6908fb41598bfdcc52b30c1 commit 9e3c846ca05513deb6908fb41598bfdcc52b30c1 Author: Dimitry Andric AuthorDate: 2024-10-09 18:57:33 +0000 Commit: Dimitry Andric CommitDate: 2024-10-11 17:36:10 +0000 biology/biosig: fix build with libc++ 19 With libc++ 19, biology/biosig fails to compile, with errors similar to: /usr/include/c++/v1/__math/special_functions.h:51:16: error: expected unqualified-id 51 | if (!__math::isfinite(__H_n)) { | ^ ./t230/../biosig-dev.h:932:22: note: expanded from macro 'isfinite' 932 | # define isfinite(a) (-INFINITY < (a) && (a) < INFINITY) | ^ This is because biosig attempts to define its own isfinite() macro, which it should not do. Stub out the incompatible definition. PR: 281976 Approved by: yuri (maintainer) MFH: 2024Q4 (cherry picked from commit 08d6ba6fa1dddca87fb19366370f0eb06c6aac21) --- biology/biosig/files/patch-biosig4c++_biosig-dev.h | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/biology/biosig/files/patch-biosig4c++_biosig-dev.h b/biology/biosig/files/patch-biosig4c++_biosig-dev.h index 8a489fdfc0db..9ca61e910c80 100644 --- a/biology/biosig/files/patch-biosig4c++_biosig-dev.h +++ b/biology/biosig/files/patch-biosig4c++_biosig-dev.h @@ -1,4 +1,4 @@ ---- biosig4c++/biosig-dev.h.orig 2022-10-08 10:54:15 UTC +--- biosig4c++/biosig-dev.h.orig 2024-08-03 10:06:47 UTC +++ biosig4c++/biosig-dev.h @@ -35,6 +35,8 @@ #include @@ -9,16 +9,25 @@ #ifdef __cplusplus extern "C" { -@@ -549,6 +551,12 @@ HDRTYPE* sopen_extended(const char* FileName, const ch - #elif defined(__linux__) +@@ -550,6 +552,12 @@ HDRTYPE* sopen_extended(const char* FileName, const ch # include # include -+ + +#elif defined(__FreeBSD__) +# include +# define __BIG_ENDIAN _BIG_ENDIAN +# define __LITTLE_ENDIAN _LITTLE_ENDIAN +# define __BYTE_ORDER _BYTE_ORDER - ++ #elif defined(__FreeBSD__) # include + +@@ -920,7 +928,7 @@ static inline void bef64a( double i, void* r) { + #ifndef INFINITY + # define INFINITY (1.0/0.0) /* positive infinity */ + #endif +-#ifndef isfinite ++#if 0 + # define isfinite(a) (-INFINITY < (a) && (a) < INFINITY) + #endif +