From nobody Sun Sep 11 21:00:32 2022 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 4MQhvh4htSz4cgMx; Sun, 11 Sep 2022 21:00:32 +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 4MQhvh42THz3W9M; Sun, 11 Sep 2022 21:00:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662930032; 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=JeO922LIbvxc8NvlWVUSjGltwdBHauNCARsMRaInmZ0=; b=UetMB5WN5/UEL3IxCn6FZKF2ANmk9eieA0O9S6ROcnNy2k0rrfhKSgLy7EPicYxyA5E9dM Mkj0K43+bFJHk6Rn/0irVq90MdnfOODnuLkJudQa3DC5qafCYjNtHurMkBAxmQ4naSj9ZO D4DKpU6+/FWO53qPGt+FVsVnoX0CESVj5j3V+XC7oTw2Im7reohYvQhxnPM2mp2hQYJ3OI hYk6TDpOUSQrzQDlI0VLmkHaNI2k/jiHtZXYIcKEVw6DHpDQVgq6GF53/aOEFqr8iVWpva ldinK3U/B3yDnNOl0a1Ue+wpmiNnrM8nwWib8TcB2QOiS7mFFFSH7n6tpKKd4g== 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 4MQhvh387VzlyV; Sun, 11 Sep 2022 21:00:32 +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 28BL0WHW022353; Sun, 11 Sep 2022 21:00:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28BL0WSY022352; Sun, 11 Sep 2022 21:00:32 GMT (envelope-from git) Date: Sun, 11 Sep 2022 21:00:32 GMT Message-Id: <202209112100.28BL0WSY022352@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 2cbf36a96437 - 2022Q3 - mail/thunderbird: fix build on legacy FreeBSD 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: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q3 X-Git-Reftype: branch X-Git-Commit: 2cbf36a964376fdd09505ad730c04b3fa6a448da Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662930032; 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=JeO922LIbvxc8NvlWVUSjGltwdBHauNCARsMRaInmZ0=; b=XoCvl1+BKhuTqWQ0nLo+1Yiume2togG5MURoo5lgX1tA5W2UXCgzc/JjiPhOlTTh2geF9U FWY2ltuT5i/X7f6D4zMxid3Nzq8HP/KsMR5U6mxvZrGLY+ZmmWUW1DxFFEq9aoeCnqMSFH PU8ufbc0PdqJW9uEBL3+rYxHiQZC9bMezUymMMygErALx8Hm7VeLpJ0JdMN8ZexevMJZl5 AZAlso/uf9xStqqJOWm2+XBI3d7w1Sbzojn1vfc8Rbw9NsxYasqyw0oZF0hJFi4zbp8Wql i41EsyETznqMqdQSNBiYm9AcX32iDJctfRvmLd5bi7e1OImOcltfl0zpmlZojQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662930032; a=rsa-sha256; cv=none; b=jB2z6JSPIS1xhd96Ra6cdc2/erzCZCRFJkbpv1Bn7EBDAVj8j5jlOU019UFCk0N2v2RdvV p+pelcKMJ1Kn5q8reM8e5fLW9biNREUHuJjhSu9C5K8mH7v1ZJPZq57DZ7voZ4uu4YdF+l Vo10aoVm486xiZvQ/i1+Cu4mgm42GtBHDg3kfdekhAfSx5fqPl6qyU9XOfezUq2LplzqIA QwiOkrZdfRJz/UB+bOWXAzySOhVl9wjmZSSzgffzEoYFsbBbJ9UJM8YPKRgg8xCUGCINcD eNM3EmLkuvdY7CxhqEcqIpnVGY3hBv/8hw0F5Pk3V0teAcUHbfKN8k91d8JHTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=2cbf36a964376fdd09505ad730c04b3fa6a448da commit 2cbf36a964376fdd09505ad730c04b3fa6a448da Author: Christoph Moench-Tegeder AuthorDate: 2022-09-11 20:54:35 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2022-09-11 21:00:20 +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 (cherry picked from commit 36957cf636cb0634fd04720ee05b9aa5f9226f68) --- .../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