From nobody Wed Mar 16 19:49:22 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 EC1DA1A203B5; Wed, 16 Mar 2022 19:49:22 +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 4KJgpB6Lf0z3LTQ; Wed, 16 Mar 2022 19:49:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647460162; 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=IZ30TJQzdCOg0XUlTW3iAr8p7o1oPIFEUnoMC48Tbwo=; b=KaPWUK/oe6QVRlCTjttpPVjKfaiOv73F2NI3L76iXcoLsaNBbIPEsqurMJgiO7BPeQL5j6 ej7R9IsiEhB/9wR8uGKidluhGsSFz723MQybH6lMoZAN8VabEJk0Dwvt0LRl/xw4IaFYeY iCxpScnbd1C6iXnW7M32nwGWbkuLgKC8HQ5V25wMo+U5XdgUREXDPIXsGUoVP80I6tQdqw M4ckJ3FcFVKNMQI2Kjy8ItkA4cbrJppH940K86Xa2Wy1nEwyIB31xL548pO5afeEaNUVIY B1xfyrPTn0KfvQtSBIJgnsM83BbrIOX6rtuLF7mAmBGFny5G4GPKtESkKQuCWQ== 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 BA2741C795; Wed, 16 Mar 2022 19:49:22 +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 22GJnMgF037065; Wed, 16 Mar 2022 19:49:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22GJnMpE037064; Wed, 16 Mar 2022 19:49:22 GMT (envelope-from git) Date: Wed, 16 Mar 2022 19:49:22 GMT Message-Id: <202203161949.22GJnMpE037064@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: 53a458c58da1 - 2022Q1 - www/firefox www/firefox-esr mail/thunderbird: fix build with libc++ 14 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/2022Q1 X-Git-Reftype: branch X-Git-Commit: 53a458c58da1ee7751072e90869e4a34686c7228 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647460162; 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=IZ30TJQzdCOg0XUlTW3iAr8p7o1oPIFEUnoMC48Tbwo=; b=wJa0wJ4/GpC0y94FLYA1iy7nZATEmcTo6v3/cHZSiFOOET30bj+S6ruwmxfbCodODH9Ox+ EIfHbjl/VJN0I8SMxIYhed8LLYt1zpKfZ3bXBr/NH8ApLbMKu8s6vm/0nn+LTlkSNQv5K1 or5U3xZ1SHXkAiNMrQJgYMQNW+N94Vbieqj4wqUbuvZzL2I3MKPvj1zORs7JZOMTmFQVXU nqcLQ5gOKJPA7OvZMolUoyzv0E3h8PNb+u3BwPSri2nCnBsc/rLcJAGbpFYTtSd8X1v1yO 7Pngop8w12/q2U20hdIdd6aLOpG2UIQ8cYg9bDjaAPXa1q9mzrvvq+Uw/HAoTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647460162; a=rsa-sha256; cv=none; b=Z9eRYsZcOPOJLdW0DOntJezF1uiQW8Uo843Yy6dLY10sY6fjK/7TgZeuTJFeoLX4hz2Z1L wU/17pz5FAqTmAFlrIrZxJJk9lHPNRhJi7p3BbSks3qEdWgqC6IsRjjYhLxLM54pboSHNC 05C0N4O3+RmI46s5CphwiSTTsND3JFQUnkkCrbL0i9OrJgB122dDS3ZO0Xdsu0iQLixyb0 J3a7p4CsdUd+DggBupGR57dwMBeodDQwiT0gaCWayWPa9reKIa2GzBE+wMkD67gMlILXR3 ziKJIFS8e8/fXaxws1RunmbfsPUBWhFkLFf1YfTYCUwcJ0vYP+bJHf34aU3o0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=53a458c58da1ee7751072e90869e4a34686c7228 commit 53a458c58da1ee7751072e90869e4a34686c7228 Author: Dimitry Andric AuthorDate: 2022-03-16 19:43:55 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2022-03-16 19:48:54 +0000 www/firefox www/firefox-esr mail/thunderbird: fix build with libc++ 14 Mozilla attempts to redefine several internal libc++ functions, such as __throw_out_of_range(). With libc++ 14 and higher, this now leads to compile errors: In file included from /wrkdirs/usr/ports/www/firefox/work/.build/dist/system_wrappers/deque:3: /usr/include/c++/v1/deque:1865:9: error: call to '__throw_out_of_range' is ambiguous _VSTD::__throw_out_of_range("deque"); ^~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/include/c++/v1/__config:824:15: note: expanded from macro '_VSTD' ^ /wrkdirs/usr/ports/www/firefox/work/.build/dist/include/mozilla/throw_gcc.h:97:59: note: candidate function MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_out_of_range( ^ /usr/include/c++/v1/stdexcept:264:6: note: candidate function void __throw_out_of_range(const char*__msg) ^ To work around this issue, avoid redefining those internal libc++ functions, if _LIBCPP_VERSION is set. (cherry picked from commit 20f8ce784b79819cb29d1f70d8a4ebac15aabeb9) --- .../files/patch-memory_mozalloc_throw__gcc.h | 69 ++++++++++++++++++++++ .../files/patch-memory_mozalloc_throw__gcc.h | 69 ++++++++++++++++++++++ .../files/patch-memory_mozalloc_throw__gcc.h | 69 ++++++++++++++++++++++ 3 files changed, 207 insertions(+) diff --git a/mail/thunderbird/files/patch-memory_mozalloc_throw__gcc.h b/mail/thunderbird/files/patch-memory_mozalloc_throw__gcc.h new file mode 100644 index 000000000000..788b9cbf837a --- /dev/null +++ b/mail/thunderbird/files/patch-memory_mozalloc_throw__gcc.h @@ -0,0 +1,69 @@ +--- memory/mozalloc/throw_gcc.h.orig 2022-03-07 19:34:37 UTC ++++ memory/mozalloc/throw_gcc.h +@@ -74,50 +74,66 @@ __throw_bad_function_call(void) { + mozalloc_abort("fatal: STL threw bad_function_call"); + } + ++#if !defined(_LIBCPP_VERSION) + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_logic_error( + const char* msg) { + mozalloc_abort(msg); + } ++#endif // _LIBCPP_VERSION + ++#if !defined(_LIBCPP_VERSION) + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_domain_error( + const char* msg) { + mozalloc_abort(msg); + } ++#endif // _LIBCPP_VERSION + ++#if !defined(_LIBCPP_VERSION) + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void + __throw_invalid_argument(const char* msg) { + mozalloc_abort(msg); + } ++#endif // _LIBCPP_VERSION + ++#if !defined(_LIBCPP_VERSION) + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_length_error( + const char* msg) { + mozalloc_abort(msg); + } ++#endif // _LIBCPP_VERSION + ++#if !defined(_LIBCPP_VERSION) + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_out_of_range( + const char* msg) { + mozalloc_abort(msg); + } ++#endif // _LIBCPP_VERSION + + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_runtime_error( + const char* msg) { + mozalloc_abort(msg); + } + ++#if !defined(_LIBCPP_VERSION) + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_range_error( + const char* msg) { + mozalloc_abort(msg); + } ++#endif // _LIBCPP_VERSION + ++#if !defined(_LIBCPP_VERSION) + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void + __throw_overflow_error(const char* msg) { + mozalloc_abort(msg); + } ++#endif // _LIBCPP_VERSION + ++#if !defined(_LIBCPP_VERSION) + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void + __throw_underflow_error(const char* msg) { + mozalloc_abort(msg); + } ++#endif // _LIBCPP_VERSION + + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_ios_failure( + const char* msg) { diff --git a/www/firefox-esr/files/patch-memory_mozalloc_throw__gcc.h b/www/firefox-esr/files/patch-memory_mozalloc_throw__gcc.h new file mode 100644 index 000000000000..53db05bc0803 --- /dev/null +++ b/www/firefox-esr/files/patch-memory_mozalloc_throw__gcc.h @@ -0,0 +1,69 @@ +--- memory/mozalloc/throw_gcc.h.orig 2022-03-05 00:14:41 UTC ++++ memory/mozalloc/throw_gcc.h +@@ -74,50 +74,66 @@ __throw_bad_function_call(void) { + mozalloc_abort("fatal: STL threw bad_function_call"); + } + ++#if !defined(_LIBCPP_VERSION) + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_logic_error( + const char* msg) { + mozalloc_abort(msg); + } ++#endif // _LIBCPP_VERSION + ++#if !defined(_LIBCPP_VERSION) + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_domain_error( + const char* msg) { + mozalloc_abort(msg); + } ++#endif // _LIBCPP_VERSION + ++#if !defined(_LIBCPP_VERSION) + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void + __throw_invalid_argument(const char* msg) { + mozalloc_abort(msg); + } ++#endif // _LIBCPP_VERSION + ++#if !defined(_LIBCPP_VERSION) + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_length_error( + const char* msg) { + mozalloc_abort(msg); + } ++#endif // _LIBCPP_VERSION + ++#if !defined(_LIBCPP_VERSION) + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_out_of_range( + const char* msg) { + mozalloc_abort(msg); + } ++#endif // _LIBCPP_VERSION + + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_runtime_error( + const char* msg) { + mozalloc_abort(msg); + } + ++#if !defined(_LIBCPP_VERSION) + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_range_error( + const char* msg) { + mozalloc_abort(msg); + } ++#endif // _LIBCPP_VERSION + ++#if !defined(_LIBCPP_VERSION) + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void + __throw_overflow_error(const char* msg) { + mozalloc_abort(msg); + } ++#endif // _LIBCPP_VERSION + ++#if !defined(_LIBCPP_VERSION) + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void + __throw_underflow_error(const char* msg) { + mozalloc_abort(msg); + } ++#endif // _LIBCPP_VERSION + + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_ios_failure( + const char* msg) { diff --git a/www/firefox/files/patch-memory_mozalloc_throw__gcc.h b/www/firefox/files/patch-memory_mozalloc_throw__gcc.h new file mode 100644 index 000000000000..81a511179852 --- /dev/null +++ b/www/firefox/files/patch-memory_mozalloc_throw__gcc.h @@ -0,0 +1,69 @@ +--- memory/mozalloc/throw_gcc.h.orig 2022-02-02 17:33:38 UTC ++++ memory/mozalloc/throw_gcc.h +@@ -74,50 +74,66 @@ __throw_bad_function_call(void) { + mozalloc_abort("fatal: STL threw bad_function_call"); + } + ++#if !defined(_LIBCPP_VERSION) + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_logic_error( + const char* msg) { + mozalloc_abort(msg); + } ++#endif // _LIBCPP_VERSION + ++#if !defined(_LIBCPP_VERSION) + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_domain_error( + const char* msg) { + mozalloc_abort(msg); + } ++#endif // _LIBCPP_VERSION + ++#if !defined(_LIBCPP_VERSION) + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void + __throw_invalid_argument(const char* msg) { + mozalloc_abort(msg); + } ++#endif // _LIBCPP_VERSION + ++#if !defined(_LIBCPP_VERSION) + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_length_error( + const char* msg) { + mozalloc_abort(msg); + } ++#endif // _LIBCPP_VERSION + ++#if !defined(_LIBCPP_VERSION) + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_out_of_range( + const char* msg) { + mozalloc_abort(msg); + } ++#endif // _LIBCPP_VERSION + + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_runtime_error( + const char* msg) { + mozalloc_abort(msg); + } + ++#if !defined(_LIBCPP_VERSION) + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_range_error( + const char* msg) { + mozalloc_abort(msg); + } ++#endif // _LIBCPP_VERSION + ++#if !defined(_LIBCPP_VERSION) + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void + __throw_overflow_error(const char* msg) { + mozalloc_abort(msg); + } ++#endif // _LIBCPP_VERSION + ++#if !defined(_LIBCPP_VERSION) + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void + __throw_underflow_error(const char* msg) { + mozalloc_abort(msg); + } ++#endif // _LIBCPP_VERSION + + MOZ_THROW_NORETURN MOZ_THROW_EXPORT MOZ_THROW_INLINE void __throw_ios_failure( + const char* msg) {