From nobody Sat Jul 16 21:55:37 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 4LlhqY5m6Sz4TRHn; Sat, 16 Jul 2022 21:55:37 +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 4LlhqY5HB5z3LFk; Sat, 16 Jul 2022 21:55:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658008537; 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=Qy6RB4kIg9HSTgTbZvSUFzJzaMKP67M1zsWJMbpsK04=; b=TRS7Kdcrk1ShImIiPrl+GM1zivsRWfWnVyMB+kV6qyvuuObARXaqWtmPCcW79Ca410oerE iGwxwUlS0MryvtUKjMhclrfotlL03LRfqUdHNJy8MiIflmBY+waArd3PDa6gB1j/TIwE06 20/pIDswisfMz5+8SMoSr9/eW/m+bTrVfB16aVgn5EfyGhm3C9mRBTuaxnYOvGbzjazxRJ E3o3bW0KyOyOCtxZdGfkC54RqmGPd32hxCw7BpO4LxDFrgBe1rWiJ0ahz4nxHDHT6Xd9tH cfB0ExmOw27p0i4N4LKC0tzt5BmFJhYJOkaBEw3hIIukDjThaPbAIONckG6qjw== 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 4LlhqY4LHQzcDp; Sat, 16 Jul 2022 21:55:37 +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 26GLtbR4019931; Sat, 16 Jul 2022 21:55:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26GLtbeD019930; Sat, 16 Jul 2022 21:55:37 GMT (envelope-from git) Date: Sat, 16 Jul 2022 21:55:37 GMT Message-Id: <202207162155.26GLtbeD019930@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: 6b2cf7d799d8 - main - www/firefox: do not attempt to build with LLVM != 13 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: 6b2cf7d799d86f3e577d45a11b1010305e79351f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658008537; 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=Qy6RB4kIg9HSTgTbZvSUFzJzaMKP67M1zsWJMbpsK04=; b=m31PK+RDK0IgzQNqaKRqmBVzVB215LBG/gwyGP3vaJUTpLHCImYrNjrE9eX08T/J0DmPvv t8fGSLzYm/dmK9mnPJDLrBl654l7mqaqFjUL78e2E5LYXDLORtlo95AvXU7vOmgiW7OR3o qk1Sm+8eGMwdw1DA7Ov05f8csMc5Rw38rtkXw/Jd31xIFkZDifu7NKZKxUM4jsD/4zE5b/ +Lxwu1Zm1Za8a+3KQYuo9ELJZdslsRILEJuityyV+rkRgYOZaZhjEt6vH2axnVqVnAif1j 2G114/PhzwY/Xo9Rda5r3/r59NA+DPE7dryjo9I+F7L2vBtz26iw5j9nQF5RSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658008537; a=rsa-sha256; cv=none; b=p/EETDvtnl1og9WtYw7dnL4KuBIJF4KGYxNhYLu8IxpVR1MifFj8zjJT4LY8BwquR4o3s+ dXGhaRSrz8F2C5wBl5jkEewXrUJc43bZSM0w9hKSOq4zw3WARjB8YBcJO6Yk3of3hES0Tn QjmPGZzkH0X2E1NyVVl+FH0HRf3+iZLjSfQ9sMYT5ppClyg1E+G1e5kHlvultiNj/1ZEU+ PG7BlovDMfhgE/2vGWs7K98J1ZltgtkCRFVDI4L/MkYe7U8b4KpwXVq52ksq3nYr/q/8Vp lKsasCJEMtWSwStAODZoztqad0JisBMAtO9CR4Sig3LVkCFA+gzYakQ+bAGZ9g== 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=6b2cf7d799d86f3e577d45a11b1010305e79351f commit 6b2cf7d799d86f3e577d45a11b1010305e79351f Author: Christoph Moench-Tegeder AuthorDate: 2022-07-16 21:51:11 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2022-07-16 21:51:11 +0000 www/firefox: do not attempt to build with LLVM != 13 we do not have the wasm tooling/runtime for that right now, and people keep messing with the defaults and running into issues. --- Mk/bsd.gecko.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 70a4ea49a0b9..901911708b41 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -95,11 +95,12 @@ MOZ_OPTIONS+= --with-libclang-path="${LOCALBASE}/llvm${LLVM_DEFAULT}/lib" . if !exists(/usr/bin/llvm-objdump) MOZ_EXPORT+= LLVM_OBJDUMP="${LOCALBASE}/bin/llvm-objdump${LLVM_DEFAULT}" . endif -# 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} +# fix LLVM to version 13, as that's the only reasonable wasi-toolchain +# we currently have +# 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.1 # keep in sync with devel/wasi-compiler-rt${LLVM_DEFAULT} -. endif +# endif # Require newer Clang than what's in base system unless user opted out . if ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so) BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}