From nobody Sun Sep 11 20:58:57 2022 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 4MQhss2wRwz4cg3J; Sun, 11 Sep 2022 20:58:57 +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 4MQhss2WFDz3TQl; Sun, 11 Sep 2022 20:58:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662929937; 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=E5B7cANdKqYaCTl+vO3nMmYGvDx86HUX6DU3n451Ew4=; b=IsuCk+N57nJjo6fQJHbsO4ChGjvefAhBtJEwYvFMW91ArtOFhCHsE902w02Xik0hTR4059 heYLwzi6RCbDNahjF18MbK3kTEQsCFuq5n+Wgg4/DZ9ghm6RsLDTCK7e2PxJyJ09pE8ZZq VjlnXk5y97uytklz/TRCdHh4qovsA1csZSRXDdqI5JcR8XVXvSQx9uHrpy34PTj2pp0Mbu ArYt+7vSbU/xcYL/UwABe+kPj5RxRFcNwi+UcnUoKjrJgtPjU3Wt4Z/ZK7482E+XLeEKCG MUrvI8aJMmbG3a/R25bEkAPs0vls5YIF6r1c+EZNhLdt2weuRAJBC9lVAnNMFw== 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 4MQhss1cQ2zlw7; Sun, 11 Sep 2022 20:58:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28BKwv3s012905; Sun, 11 Sep 2022 20:58:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28BKwvK9012904; Sun, 11 Sep 2022 20:58:57 GMT (envelope-from git) Date: Sun, 11 Sep 2022 20:58:57 GMT Message-Id: <202209112058.28BKwvK9012904@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 36957cf636cb - main - mail/thunderbird: fix build on legacy FreeBSD 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: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36957cf636cb0634fd04720ee05b9aa5f9226f68 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662929937; 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=E5B7cANdKqYaCTl+vO3nMmYGvDx86HUX6DU3n451Ew4=; b=ThWL7Q/iHUT15Kb3eeTc4pYu6kP3sS7XRu2ezSNIcqF/pcT3SpFtM3wZ4xZUGjpuqSwgg/ y95Rijx92Zx62pmpmI3ntcA4bx3zB1Rn7ryXDsQaI9A4/rcrNYeJM/eMuvcNZYTJ/BJ/ri ba8PqqqgxocaL0MNhepCUoZsM3nGG4eGeLn2SsoDn+LtyuakdcBOGShG+ooJ0rshtrSs7c CkpAczDkCwJITsatbRu8cj10YA124atTU8h6Sw7W6QExGuXK313TjDewd/QDLvquEGCwdO TZh6y3uHyNx7/x7ZxqnZL4WxMen1pOny684RhuXCtMCRAXap9akKUIRSrIJDug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662929937; a=rsa-sha256; cv=none; b=g0NFhq2phw+j79m/Zharc93QJXdTNBh6qLcoPv6eyA8BGR/2P/VuRl2xNOIKcLlv8EqQSY J43R5R9SoFOskomgzK4YmiO7b9reagRf1YBCGFu+wD3/iUvYaAeCtL2KdkNsc3UhP9Z4L6 NxcXmMadwYSJNF/X02mSQb70qLbqCmdGyptQ+vHA+SnmzbRaUXr2hv7L7tfsZAl5C1imUF kYc7StOyRMmYUV0YEfCCDIBKkYhdIW0c8NzS8mXofoo9j84ywUTIOlOmC083JVe69RHjsH jqCjuTph3LxBjCUiWkKbQoKQSV0PEMiUUkcAuxwun1MMqq6/JpQGOfSavJaxmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=36957cf636cb0634fd04720ee05b9aa5f9226f68 commit 36957cf636cb0634fd04720ee05b9aa5f9226f68 Author: Christoph Moench-Tegeder AuthorDate: 2022-09-11 20:54:35 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2022-09-11 20:54:35 +0000 mail/thunderbird: fix build on legacy FreeBSD just as firefox/firefox-esr, we need to work around missing CPU_SET macros on old FreeBSD. Patch taken from 65f70bb54d/4a4ffa51d5. Reported by: Barbara --- .../files/patch-tools_profiler_core_patform.cpp | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/mail/thunderbird/files/patch-tools_profiler_core_patform.cpp b/mail/thunderbird/files/patch-tools_profiler_core_patform.cpp new file mode 100644 index 000000000000..905e6d7bbe49 --- /dev/null +++ b/mail/thunderbird/files/patch-tools_profiler_core_patform.cpp @@ -0,0 +1,51 @@ +commit 45a7951cb6a9b1735b9b6cec89db69b5933715c7 +Author: Christoph Moench-Tegeder +Date: Mon Mar 28 21:54:35 2022 +0200 + + FreeBSD can use sched_getcpu() from 1400046/1300524 on + +diff --git tools/profiler/core/platform.cpp tools/profiler/core/platform.cpp +index 92bcc1100687..2f17a88942a8 100644 +--- tools/profiler/core/platform.cpp ++++ tools/profiler/core/platform.cpp +@@ -111,6 +111,20 @@ + # include + #endif + ++#if defined(GP_OS_freebsd) ++#include ++// "after making CPU_SET macros compatible with glibc" ++# if __FreeBSD_version > 1400045 || (__FreeBSD_version > 1300523 && __FreeBSD_version < 1400000) ++# include ++# else ++# if __x86_64__ || __i386__ ++// similar cpuid_count() trick as on Darwin, using LLVM ++// but not for all CPUs ++# include ++# endif ++# endif ++#endif ++ + #if defined(GP_OS_windows) + # include + +@@ -6368,6 +6382,19 @@ void profiler_mark_thread_awake() { + cpuId = ebx >> 24; + } + # endif ++#elif defined(GP_OS_freebsd) ++# if __FreeBSD_version > 1400045 || (__FreeBSD_version > 1300523 && __FreeBSD_version < 1400000) ++ cpuId = sched_getcpu(); ++# elif defined(__amd64__) ++ unsigned int eax, ebx, ecx, edx; ++ __cpuid_count(1, 0, eax, ebx, ecx, edx); ++ // Check if we have an APIC. ++ if ((edx & (1 << 9))) { ++ // APIC ID is bits 24-31 of EBX ++ cpuId = ebx >> 24; ++ } ++# endif ++// the fallthrough is cpuID = 0 + #else + cpuId = sched_getcpu(); + #endif