From nobody Tue Nov 30 18:32:10 2021 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 20F6718B2746; Tue, 30 Nov 2021 18:32:11 +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 4J3W625kqTz3k2F; Tue, 30 Nov 2021 18:32:10 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 A5A371B1E4; Tue, 30 Nov 2021 18:32:10 +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 1AUIWAGH014911; Tue, 30 Nov 2021 18:32:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AUIWA2r014910; Tue, 30 Nov 2021 18:32:10 GMT (envelope-from git) Date: Tue, 30 Nov 2021 18:32:10 GMT Message-Id: <202111301832.1AUIWA2r014910@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: 67d9f1559aa7 - 2021Q4 - www/firefox: make dep on wasi-compiler-rt more flexible 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/2021Q4 X-Git-Reftype: branch X-Git-Commit: 67d9f1559aa71f3a4e90b99387a11871d00b7d8d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638297130; 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=jpWOA4/VLTxWASfhpIuNNsP+KLRXawhEZKQP2y3xKIQ=; b=JHy+nvG9XGj58I80fZzcmWVebNl7MZtfpUxvsHTR8/9fOPfQcFMyohMRwivyb9r+0qaENh gWA5Ljt5NRjjnoDhT3faYdi8h53udsF1tw1kfO9RTX2OcXa2hECA4gdRwW2KwyWXpwOdKr tNdKC40hf0IcRsl5a62iXua0iw/AokjvgjBdjDRCPaGi28I/2tqsPzpCcCu9YUqkAotV4j 80x9U1rRiCtEMqxq7yreqDRaPo5W6f3pst0+U/Fce+GlzOGynGo9Pbt3Xf7F609AIzrsRG gk8IKv0A3Il3kkPJ30khiZDHlWAHAzkRI0vWNexsuEiu6FndycEfRh4vn2LXDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638297130; a=rsa-sha256; cv=none; b=dtT2gl9yoahEPBCahL7VkVgqGu456Jp4mAIpjE2b64P9WSYdE7V1qtPgc9jZZyFlBHVG5R IAH0tfMHwm25FRrGhN+QVTq+DvTyuzb8BNq8CPMD7dsKpc3icofuC/WiS6k8Lde1IpTA8/ cedHsuey/tm1eGKvf+V5tV44uDx55EGjaV8JOAEXAlSiRQpNMI2Y7sq0wOEboLlybosOJD hueJMa99tS2BYbuWJ9UIjA0IZdd34jZ2FUAFoSieV2Duy2vgSCE9AEf0gVictbczFOO+my +DQ1jRNmQOwGj5ZxywgBSOiDUqP73QhN3yp7X5oqLhTYyLHi3GXNbuTo5hcQcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=67d9f1559aa71f3a4e90b99387a11871d00b7d8d commit 67d9f1559aa71f3a4e90b99387a11871d00b7d8d Author: Christoph Moench-Tegeder AuthorDate: 2021-11-30 18:22:07 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2021-11-30 18:31:41 +0000 www/firefox: make dep on wasi-compiler-rt more flexible as firefox needs matching wasi-compiler-rt, embedded llvm in rust and llvm for building and wasi-compiler-rt installs it's files in a path depending on it's full distversion, we need to know llvm/clang's full version. it's not possible to derive that programatically, as the required llvm version may not be installed at the time firefox' Makefile is being parsed. (cherry picked from commit dcc6b13daedf095da6572c27af69713ee551cb81) --- Mk/bsd.gecko.mk | 1 + www/firefox/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index a22eaf47f217..92833a7a101f 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -102,6 +102,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= 12 # chase bundled LLVM in lang/rust for LTO +LLVM_VERSION= 12.0.1 # keep in sync with devel/wasi-compiler-rt${LLVM_DEFAULT} .endif # Require newer Clang than what's in base system unless user opted out . if ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index b93ef4ba7e27..ab6318e47579 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -27,7 +27,7 @@ BUILD_DEPENDS= nspr>=4.32:devel/nspr \ zip:archivers/zip \ ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx \ ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc \ - ${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/clang/${LLVM_DEFAULT}.0.0/lib/wasi/libclang_rt.builtins-wasm32.a:devel/wasi-compiler-rt${LLVM_DEFAULT} + ${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/clang/${LLVM_VERSION}/lib/wasi/libclang_rt.builtins-wasm32.a:devel/wasi-compiler-rt${LLVM_DEFAULT} USE_GECKO= gecko CONFLICTS_INSTALL= firefox-esr