From nobody Tue Feb 08 20:02:04 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 96C3C19BE081; Tue, 8 Feb 2022 20:02:13 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JtYnd1fZMz3Cr7; Tue, 8 Feb 2022 20:02:12 +0000 (UTC) (envelope-from tijl@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644350533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MXUm6ARjmwpnfjkikdMIPnQyNKjkUMyhx860vpKbTmU=; b=RlQx00edddXXNWWCwusx7i3AGFL/+YrYxTt2ivXw75WaDOm1AGyVZ29Q7SxnQl72tSm2Vy v/dtewKMnwmUxB+t7ni7HoJFaPjprdCxh55fnsPgPcDjmRcybOWRZ7/ckkU+VYtmOn9VQJ tELtuoa4t3fT2ywr7ABh6eNSkVcAAF4tgd4xjZ6qEMScsP0IaGsBfn0O62wqbQURF7aYYA q1V1JqdxS4tBpT49NV+jd1mIkSIZLxmZn6pa3bsUDizRpmm5g0xVlDzUqyCsEjhnPDYpm5 XJqaI7yZB2BIPmf1fX9Ztr+NmTbCIweIaG/cQ56ic+lVoToqKkDNXoUvOC5x8g== Received: from localhost (unknown [IPv6:2a02:a03f:894b:4700:ddb2:3ca6:5e35:1176]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: tijl) by smtp.freebsd.org (Postfix) with ESMTPSA id AE392B049; Tue, 8 Feb 2022 20:02:10 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Date: Tue, 8 Feb 2022 21:02:04 +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: <20220208210204.0c38d383@FreeBSD.org> In-Reply-To: <20220208210020.7a51a314@coosemans.org> References: <202202081928.218JSIaV055890@gitrepo.freebsd.org> <20220208210020.7a51a314@coosemans.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=UTF-8 Content-Transfer-Encoding: quoted-printable ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644350533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MXUm6ARjmwpnfjkikdMIPnQyNKjkUMyhx860vpKbTmU=; b=vHtbLiKPmtkUE99vasrkxQ7Q/R++NtH4BQZ7/hsWO6ZGNYt0cGjgc50TKpiSNjrCfTLInt G7j+gcY1bjWLcBSK2Ksn2AcHIZ9hq3tPheftXyXhlGGzNJ0fdqqVi9Q0Udz16wU1t/x82z xDrdmGD2ij62y7oYzBe9PkfDZmCxu8/ZizBkXn5HMcabqChNei/PB4/4Lkg0jH+/CFXqQ4 T+ZKtek5fUEQRN+nBaEz9QdZ3G0rQEtdFOwktzBbwjffDJl3D3SHDVcjF8gVcBqAeyB7kE vK91+7IaYCTV/YkP4lVNp7wPtypxT19drY7BMbYZkUqIKk7jn2aQBGUpYeXGvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644350533; a=rsa-sha256; cv=none; b=yhw94BShHCOcQpkZuU+7d4WifIty4x/sw5SP0TwiJqjm4WPZRzQvUE0OhN02HglNIIwI13 ekE0YL7llMX8AGGfUEfHi1KeY5wJX1iGhIvXDcLH0t4tmbXB1LCkxGHQrcB/jc//sWZwOF fykCo1llJU7g8Ok3C6XK0fc9pTCJK5k3pBpBBez6kNlou8RAy77RbpesN95nK+2YgpzSOg 72OtR8B5AEgAr/yx0cOQJLKL2bsGxVPpERm1vrO80WaU3efBb+uBojgGnjnXyvy+hQa66M 8ibAcGk63gRO7HApB7vwrrzXpirLqIHlGN+2roPkgoMSxh3zs00ismreuj0fYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On Tue, 8 Feb 2022 21:00:20 +0100 T=C4=B3l Coosemans wrote: > On Tue, 8 Feb 2022 19:28:18 GMT Christoph Moench-Tegeder > wrote: >> The branch main has been updated by cmt: >>=20 >> URL: https://cgit.FreeBSD.org/ports/commit/?id=3D51e8257584202f96099f31a= df71577099fbb12ce >>=20 >> 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 >>=20 >> www/firefox: unbreak after b00578b9b208 >> =20 >> 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 nee= d. >> --- >> 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(-) >>=20 >> 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+=3D LLVM_OBJDUMP=3D"${LOCALBASE}/bin/llvm-o= bjdump${LLVM_DEFAULT}" >> # Ignore Mk/bsd.default-versions.mk but respect make.conf(5) unless LTO= is enabled >> .if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mllvm*} || ${POR= T_OPTIONS:MLTO} >> LLVM_DEFAULT=3D 13 # chase bundled LLVM in lang/rust for LTO >> -LLVM_VERSION=3D 13.0.0 # keep in sync with devel/wasi-compiler-rt${LLVM= _DEFAULT} >> +LLVM_VERSION=3D 13.0.1 # keep in sync with devel/wasi-compiler-rt${LLVM= _DEFAULT} =20 >=20 > 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 wasi-compiler-rt${LLVM_DEFAULT}>0:devel/wasi-compiler-rt${LLVM_DEFAULT}