From nobody Tue Nov 30 18:26:48 2021 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 ABEFA18B03E1; Tue, 30 Nov 2021 18:26:49 +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 4J3Vzs03nLz3hT6; Tue, 30 Nov 2021 18:26:49 +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 D80C41AF70; Tue, 30 Nov 2021 18:26:48 +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 1AUIQmL1001921; Tue, 30 Nov 2021 18:26:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AUIQm0p001920; Tue, 30 Nov 2021 18:26:48 GMT (envelope-from git) Date: Tue, 30 Nov 2021 18:26:48 GMT Message-Id: <202111301826.1AUIQm0p001920@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: dcc6b13daedf - main - www/firefox: make dep on wasi-compiler-rt more flexible 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: dcc6b13daedf095da6572c27af69713ee551cb81 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638296809; 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=15ze7B1t6ytP6lyW75hlSQMPubSbTNgbaVhySasFcf4=; b=WigtS6Z8FsuAWIV7fPSWEL8lI9BHGe1kWWpZ3Wm2IMQPccfBh3Ssa8q68idPRclsd6O8nY oDNJDZECm/0nmMsiX+rHBj8hvt2ufN28sZvZJStL6np7Sz0HvHBhL2bSukrY75TSisgq+o mCpe3LuqayOutM4qlMc8pLblD+08zlaE2L/+4wTcgDXtCGkovMTb+XDxIloM8crKW/JLCs lIPJa7SGQCHrKlfHjZzR/3L6eKWid2hdCgDBoVifVbBKB2kfVor9OKs9GL0jdOqcKvzLRJ gcy9usvVKqZsIKKMcMoPHC8gjWjIdRIQ3NsQ1wMi4El5xoTVT8Xj9LVxamnOMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638296809; a=rsa-sha256; cv=none; b=h7HAbMV9UXs52EIRe70b4LB0dCXvKiYBNAktZIKq9as+vl6oxXKrKIutgFinfZwt0Cg5KT XZScfOrRaC2+9lTASkcAICR9qjnDaYU4dPVF3r1SP0VNBpWX5t1t7kC2rxYp4iet+19UHx CUYkp30RhRpwZuV9VEeM32ll1A9nSEtJBXB2H9RbR9+/ZXRu8msACnobr3TLasWOZi4P6h iNf7Nu3kzMkMGd3mJrHC39bI9+cNr6IMp8VzD728Vzcj+FeIdoAgsmwTmhHFBh920BWV8l q9nt5wAz4sSMI195KF5bgSRoeqwCLTJ046yjSgrT9ewj/3+i85gaAZNKLpyK3g== 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=dcc6b13daedf095da6572c27af69713ee551cb81 commit dcc6b13daedf095da6572c27af69713ee551cb81 Author: Christoph Moench-Tegeder AuthorDate: 2021-11-30 18:22:07 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2021-11-30 18:22:07 +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. --- 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 b912e1aa7ade..b4500564c0ce 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -95,6 +95,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} .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