From nobody Tue Feb 08 20:00:20 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 881EA19BBEBD; Tue, 8 Feb 2022 20:00:35 +0000 (UTC) (envelope-from tijl@coosemans.org) Received: from mailsec205.isp.belgacom.be (mailsec205.isp.belgacom.be [195.238.22.101]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "relay.skynet.be", Issuer "GlobalSign RSA OV SSL CA 2018" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JtYlj6XxHz4vlM; Tue, 8 Feb 2022 20:00:32 +0000 (UTC) (envelope-from tijl@coosemans.org) X-ExtLoop: 1 X-IPAS-Result: =?us-ascii?q?A2DbBABXywJi/wSs8lFaHgEBCxIMQAmBRgsCgyRWAXyNW?= =?us-ascii?q?oVrAYInOAGLYpA4gXwLAQEBAQEBAQEBQAoEAQGFBYNvJjQJDgECBAEBAQEDA?= =?us-ascii?q?gMBAQEBAQEDAQEGAQEBAQEBBQQBgRuFLzkNQAEQAYFjIoNsAQU6PxALGC5XB?= =?us-ascii?q?hODBYMaC6t4gTOBAYhWgSeBOgGOMkM/gQxCgRWDKj6CBV4EGIdDBJMNgQ8HJ?= =?us-ascii?q?ASBeaIPnmaCa2WLApRDTZY3kVaHE483jRKUMIcPghVNMIMsCUgZD5YwdYVLQ?= =?us-ascii?q?AMwCy0CBgsBAQMJgjyHBIcuAQE?= IronPort-PHdr: A9a23:KG7T4h8wSAMhaf9uWe67ngc9DxPPW53KNwIYoqAql6hJOvz6uci4Z gqCur401AKBdL6YwsoMs/DRvaHkVD5Iyre6m1dGTqZxUQQYg94dhQ0qDZ3NI0T6KPn3c35yR 5waBxdq8H6hLEdaBtv1aUHMrX2u9z4SHQj0ORZoKujvFYPekdq72/qy9pDRbAlEmSaxbLNvJ xiqsAvdsdUbj5F/Iagr0BvJpXVIe+VSxWx2IF+Yggjx6MSt8pN96ipco/0u+dJOXqX8ZKQ4U KdXDC86PGAv5c3krgfMQA2S7XYBSGoWkx5IAw/Y7BHmW5r6ryX3uvZh1CScIMb7S60/Vza/4 KdxUBLmhicJOSAk/m/UiMNwgq1Urw6uqRFk347ZYpuYOOZicq/BY98XQ3dKUMZLVyxGB4Oxd 5UBDe8FPe1FsYT9oFwOrQCgCgmpHuzvzCRIjWLx0K0m0uQhEwXG0Rc8ENIJt3TUt8v6NKIIX uCz16nE1zLDb+lZ2Trk7oXDbx8ur+2WU71qbcrR1VcgFxnDjliIp4LoMTGY2voJvmWZ7+dtS f6ihWAmpgxvrTWi2sMhh4rJi48IxV3J9jl1zZgpKdC4VkJ2f9GpHZRfui2GOYZ7TcUvSHxmt iY9z70Jo5+7fC4SxZQp3R7QdeKIfJOT4h3+TuqRJi14hH19dLKwmRm97UugyurmWsmx01ZGt jdKncfCtn8XyhzT7tSHRuJj/ki/wzaPzAHT6uZCIUAvj6bbLp0hz7gtnZQQqUTOBiz7lFjsg KOIeUgo5PKk5/nlb7n4vJOROIl5gRzkPKs0gMywG+E4PxALX2ic5OuzyqXu/Vb8QLVWlv02l bTZsIzCKcQbuKG5BwhV354g6xmlCzem0dEYkmcdLFJCYh6Hk4npO1PKIPziEfi/hFOskCx1y PDDJLLhBI7NImLEkLf7crZx809cyAwtwtBD/59ZCawNLOjtVkL+qtDUFAI1Pg6qz+r9B9hxz oYeVniOAq+dPqPSq1iI5uc3LumQZY8VujL9JuM56P7pin85gkESfayz0psRc3C0BPNmI1+WY Xb0hNcOCn8FvhAiQ+zylF2CTTlTam69Uq4k/DE0FJqmDZvfRoCqmLGOwTm0HoNPam9aDVCMF HLod4SYW/cXcS6SOshhkiYYVbi6UoMh0AuhtA78y7d8IOrU4DMXuoz429hu+uLfjxYy9SZ7D 8iFyWGCU3l0nn8URz8xxK1wvFJyykma3adkhPxYENlT5/JVUgchLJLc1+t6C8ruWgLaZ9uGU lKmQtG9DDE/VNI+3cEBbF1mG9q/lBzD2DCqA7ANm7yRGJM06r7c32T2J8tl03bG07Mhj0U9Q sdWKWKmgat/9w3SB47Vj0WWibyqdb8H0S7D7meM03SBs1pDUAFtS6nFWmofZkTOodTj+kzCV 6OuCaggMgZZ1cGCL7dKZ8bnjVVcWvjsJs/RY3mslGuqAhaI3LyMP8LWfDA23D/cE1QDiwBb2 HGLMwM+QxusrG/SASYmQVnqf2vC6+RzgkiXCEguwFfZQVdm0u+JHRpdrvubUP4W17Qf8HM9q jdwNF262MnbDtOGvExmZqoKMoB120tOyW+M7181BZenNa033jYj IronPort-Data: A9a23:MmRQHar6HgQPyDnLb/sWCtjS+1leBmIYZBIvgKrLsJaIsI4StFCzt garIBnTPP3cMGShfNAgbo3gphgPusPRzd5mHVZupXhhQ3sXoOPIVI+TRqvS04N+DSFioGZPt Zh2hgzodZhsJpPkjk7xdOCn9BGQ7InQLlbGILes1htZGEk0GE/NtTo5w7Rj2tQw0YDja++wk YqaT/P3aQfNNwFcbzp8B5Kr8HuDa9yr5Vv0FnRnDRx6lAe2e0s9VfrzFontR5fMebS4K8bhL wr1IB5VyUuCl/slIovNfr8W6STmSJaKVeSFoiI+t6RPHnGuqwRqupvXOsbwZm8K0QeQsMgy7 uxXuJGZaQcvPKPRtM00Bkww/yFWZcWq+ZfEKHy+tMGJyAvacnnohf5pC1o7OIQe4aBwG24mG f4weGlLNEzZwbvpmvTnIgVvrp1LwM3DIIIdvllryjbCAPMvR4uFRL/FjTNd9G1o3ZkfQ6uBD yYfQTExahbAPj9uAVI4BbtjnveD2VnfciIN/Tp5ooJyuQA/1jdZ3LXzddHSf9mLWd4QhkGCu nmD+m34BDkULtGSwyGJtHW2iYfnkS7lHYkVEbi56uUvmFqJ2ndWARkSfVWhrPSzkUL4XMhQQ 2QM/TAytu0580muT8XhUgejiHCesxMWQNYWFPc1gCmGz7b87RyUC2IfQnhGctNOiSMtbWBsj wDT2om1X3k/6fucRWmZs7uFq3WzIjBTJ2IGaiYPSg5D6dSLTJwPsy8jh+1LSMad5uAZ0xmqq 9xWhEDSTIn/QSLGO2tXMLwHb/+RSkD1czMI IronPort-HdrOrdr: A9a23:lJ0JvqG4+0hM/fs7pLqF4pHXdLJyesId70hD6qkvc20wTiXIrb HKoB1E726XtN/VYgBZpTmlAtjzfZq6z+8B3WBxB8bXYOCCghrSXftfBOTZsk7d8kfFmNK1uZ 0QDJSWaueAemSS5PySiGLTfLdQpqj7zE2xv4uutkuFKzsaGp2Ihz0JbTpzPXcGOjWubqBJaK Z0iPA31wZITU5nGPhTS0N1HtQra+eqqHqzCyRqOzcXrC21yR+44r/zFBaVmj0EVSlU/Lsk+W /Z1yTk+6SKqZiAu1nh/l6Wy64TtMrqy9NFCsDJoNMSMC/QhgGhY5kkc6GevQoyvPqk5D8R4Z 7xSi8bTp1OAk7qDySISFrWqkvdOQ8VmjzfIIqj8D/eSc+QfkN3NyMOv/MATvLj0TtpgDhL6t MH44uojesfMfr+plW32zHpbWAkqqPmmwttrQYs50YvG7f2LoUh7bD3NXklc6s9IA== X-IronPort-Anti-Spam-Filtered: true Received: from 4.172-242-81.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([81.242.172.4]) by relay.proximus.be with ESMTP; 08 Feb 2022 21:00:23 +0100 Received: from localhost (localhost [127.0.0.1]) by kalimero.tijl.coosemans.org (8.16.1/8.16.1) with ESMTP id 218K0LDk001313; Tue, 8 Feb 2022 21:00:22 +0100 (CET) (envelope-from tijl@coosemans.org) Date: Tue, 8 Feb 2022 21:00:20 +0100 From: =?UTF-8?B?VMSzbA==?= Coosemans To: Christoph Moench-Tegeder Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: 51e825758420 - main - www/firefox: unbreak after b00578b9b208 Message-ID: <20220208210020.7a51a314@coosemans.org> In-Reply-To: <202202081928.218JSIaV055890@gitrepo.freebsd.org> References: <202202081928.218JSIaV055890@gitrepo.freebsd.org> 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=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4JtYlj6XxHz4vlM X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of tijl@coosemans.org has no SPF policy when checking 195.238.22.101) smtp.mailfrom=tijl@coosemans.org X-Spamd-Result: default: False [-2.20 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FREEFALL_USER(0.00)[tijl]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[coosemans.org]; AUTH_NA(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MLMMJ_DEST(0.00)[dev-commits-ports-main,dev-commits-ports-all]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:5432, ipnet:195.238.0.0/19, country:BE]; RCVD_TLS_LAST(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_IN_DNSWL_LOW(-0.10)[195.238.22.101:from] X-ThisMailContainsUnwantedMimeParts: N On Tue, 8 Feb 2022 19:28:18 GMT Christoph Moench-Tegeder wrote: > The branch main has been updated by cmt: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=51e8257584202f96099f31adf71577099fbb12ce > > commit 51e8257584202f96099f31adf71577099fbb12ce > Author: Christoph Moench-Tegeder > AuthorDate: 2022-02-08 19:26:13 +0000 > Commit: Christoph Moench-Tegeder > CommitDate: 2022-02-08 19:26:13 +0000 > > www/firefox: unbreak after b00578b9b208 > > the webasm components must follow llvm (the llvm we use for building > firefox), and wasi-compiler-rt and wasi-libcxx are really just > llvm components and should be at the same version as the llvm we need. > --- > Mk/bsd.gecko.mk | 2 +- > devel/wasi-compiler-rt13/Makefile | 2 +- > devel/wasi-compiler-rt13/distinfo | 6 +++--- > devel/wasi-libcxx/Makefile | 3 +-- > devel/wasi-libcxx/distinfo | 6 +++--- > www/firefox/Makefile | 2 +- > 6 files changed, 10 insertions(+), 11 deletions(-) > > diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk > index 52107a1c0c4c..fdc1effe8672 100644 > --- a/Mk/bsd.gecko.mk > +++ b/Mk/bsd.gecko.mk > @@ -98,7 +98,7 @@ MOZ_EXPORT+= LLVM_OBJDUMP="${LOCALBASE}/bin/llvm-objdump${LLVM_DEFAULT}" > # Ignore Mk/bsd.default-versions.mk but respect make.conf(5) unless LTO is enabled > .if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mllvm*} || ${PORT_OPTIONS:MLTO} > LLVM_DEFAULT= 13 # chase bundled LLVM in lang/rust for LTO > -LLVM_VERSION= 13.0.0 # keep in sync with devel/wasi-compiler-rt${LLVM_DEFAULT} > +LLVM_VERSION= 13.0.1 # keep in sync with devel/wasi-compiler-rt${LLVM_DEFAULT} This variable isn't defined when DEFAULT_VERSIONS contains llvm and the LTO options is off, which then breaks the dependency checks in www/firefox. You can simply remove this variable if you replace the dependency in www/firefox with