From nobody Mon Mar 7 16:46:36 2022 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 CC7521A06C10; Mon, 7 Mar 2022 16:46: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 4KC49S546Cz4kBY; Mon, 7 Mar 2022 16:46:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646671597; 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=OcwGRYf52vQWdhCrxtd9gj5ESeV9NPvXNjoS8mMVdW0=; b=P+sOdOtstbfkyR3SOx70Vm2v1Fuuj3/Y5DVmmtX1QG+yctCLIITenrjcEp/qcyQfjQjqYS QSWUdm3zG6a2wDjST6XndUJVk7bvllWV7V3cWynNKat+RzdElc+MC8rN5Cw+8g3nSsODfl LEuu7IzjwZuWYInUsanXWK8K31kj9rkuL5YfiaV1Zcy6qKPnOobjsXCi8b2Kg0dFhMSV1O +tQ4R5me+QV13W1LIGczlzrj3qwh6aoB4SseMsq0rVKM8C2u0Ipii8WMbn/gdGm1CXVNOQ iR3FI22fP3hEckC8KvU4x/J3Kabu5+gNFugl0Z1ImezxTk1yLo1j+DS1vBJr9Q== 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 538EE4085; Mon, 7 Mar 2022 16:46:36 +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 227GkaSA030971; Mon, 7 Mar 2022 16:46:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 227GkaMR030970; Mon, 7 Mar 2022 16:46:36 GMT (envelope-from git) Date: Mon, 7 Mar 2022 16:46:36 GMT Message-Id: <202203071646.227GkaMR030970@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Rene Ladan Subject: git: ce8f53fa4f44 - 2022Q1 - www/chromium: use base LLVM instead of binutils 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: rene X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: ce8f53fa4f441a63306fb099a0dc8d9c0e956e46 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646671597; 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=OcwGRYf52vQWdhCrxtd9gj5ESeV9NPvXNjoS8mMVdW0=; b=SrY8HxsMcjPQdujdFe/wpvkOHCcnHFAqESW5KS2r3PeIFCRqF/zufuVDFP2FOYq8hxfCKw ZxoiRhhKh1G0fF5HcNK/TPelPlXtPvRKwhNGKPEIHShqqGfaQIVFIY5MofibS+DcxJWzgg fHlecTufjCnj7+WBTG5RLNmbdxQDHD4QDyaT9Hqb6PUDYH6sBWzLOZDakxWFYUt8z3ArEG XmQsUJkzVZFPcuhsO5zV8KH6cTZicgBtHaQ+px/TjBNhv3aUAMzFPpTMZN2aDZw2QzfOZ4 q8YIQfm7WQ08N/07oHJTR4JIQr1aXE9qRKzCjuwVpcAWDYOc/0QYvAisxYKHrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646671597; a=rsa-sha256; cv=none; b=pCAL9a+fZFmUNIC7vFWJaArFUxmtwAU20ZA3owOZpvlqhXHjrw+nA+rREbFO81U/0/nWoE Z+AUYZ5yOoM097t1pYTQcuouCRISZ8NEQVqyv+LckhHt42uKeDwQTV+kK3x+vRVQyYGiqg NfstomMJMqEYG/m592yimhUC4Z/hHtDfenFGWXGSkAz9P/W0gK+O5y7JUjJW+dqWB2Dpnu UaKkzRH/4of+3eZ8ykmRn/zJ46yZb4s8frSHglnpQwuwsAiwyFWvQ0kEefs6iI4w37RiNj E/dX0rjDCyDeXJ/yji+aj9hDDWphgPk+6gMOLUFulkIZtaKCniqm1luvBd2KVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=ce8f53fa4f441a63306fb099a0dc8d9c0e956e46 commit ce8f53fa4f441a63306fb099a0dc8d9c0e956e46 Author: Robert Nagy AuthorDate: 2022-03-07 16:43:44 +0000 Commit: Rene Ladan CommitDate: 2022-03-07 16:46:27 +0000 www/chromium: use base LLVM instead of binutils Use ar, nm, and readelf from base LLVM, drop build dependency on devel/binutils port. Bump PORTREVISION. (cherry picked from commit 189d2aa322672e82c9f0604c64766c3fa60a7bdd) --- www/chromium/Makefile | 7 ++++--- .../files/patch-build_toolchain_gcc__toolchain.gni | 15 +++++---------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index e9c5492b11d5..cd2df0d2a538 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -2,7 +2,7 @@ PORTNAME= chromium PORTVERSION= 99.0.4844.51 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ https://nerd.hu/distfiles/:fonts @@ -23,7 +23,6 @@ BUILD_DEPENDS= bash:shells/bash \ flock:sysutils/flock \ node:www/node \ xcb-proto>0:x11/xcb-proto \ - ${LOCALBASE}/bin/ar:devel/binutils \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ ${LOCALBASE}/share/usbids/usb.ids:misc/usbids \ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} \ @@ -80,7 +79,9 @@ SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang- MAKE_ARGS= -C out/${BUILDTYPE} ALL_TARGET= chrome -BINARY_ALIAS= python3=${PYTHON_CMD} +BINARY_ALIAS= ar=/usr/bin/llvm-ar \ + nm=/usr/bin/llvm-nm \ + python3=${PYTHON_CMD} # TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn) # diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni index 4d018d8b2dee..fbdf61db220d 100644 --- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,4 +1,4 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2022-02-28 16:54:41 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2022-03-06 09:37:52 UTC +++ build/toolchain/gcc_toolchain.gni @@ -53,6 +53,12 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") @@ -13,27 +13,22 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -747,13 +753,17 @@ template("gcc_toolchain") { +@@ -747,13 +753,12 @@ template("gcc_toolchain") { # use_gold too. template("clang_toolchain") { gcc_toolchain(target_name) { - prefix = rebase_path("$clang_base_path/bin", root_build_dir) - cc = "${prefix}/clang" - cxx = "${prefix}/clang++" -+ if (is_freebsd) { -+ prefix = "/usr/local/bin" -+ } else { -+ prefix = "/usr/bin" -+ } + cc = "cc" + cxx = "c++" ld = cxx - readelf = "${prefix}/llvm-readelf" - ar = "${prefix}/llvm-ar" - nm = "${prefix}/llvm-nm" -+ readelf = "${prefix}/readelf" -+ ar = "${prefix}/ar" -+ nm = "${prefix}/nm" ++ readelf = "readelf" ++ ar = "ar" ++ nm = "nm" forward_variables_from(invoker, [