From nobody Wed Aug 28 10:31:14 2024 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 4Wv10f3F19z5T0DP; Wed, 28 Aug 2024 10:31:14 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wv10f2jHbz4vrf; Wed, 28 Aug 2024 10:31:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724841074; 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=2bfTVEldryKbZa59bPNaaylOj1QAqVlKY4GPVYb0/fE=; b=S2/i+V5NMLEIXGKOL2thmkXWj1gv4g5ZOw4MIyZLH2f53qlz7Yo2Ae8C0RGlmL9Waf4qpB Kc3zrhw1+ufRBRnvoFxLUTB+CehoD3l8NL/1tHEy+8bnkItPsYgUrLvyb6+BezkrZ7bbd5 gbwiOhGoqNw8TzEXzIgv7rP4Cx5+EXqQCvV/riOwn4rJTD26Om1OHrtoX0666PhpYuwpP8 sk7dZBVl5t/q1VqoqMHYNnMD8cbTfSUECmldUngg0KaELajrRQhRBxhSQLnXdmh5QjQpwU SUeqGcmJ47tm9VpWBJ06RNGRLz6TrDg66eakitUSwWACMQLrd2uFwW1CL5hagw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724841074; a=rsa-sha256; cv=none; b=t3zSBZafqCWsWBFcazUaxsU426+hASN0CQzEiubBeXv38pACRSnwAu2ytZLXjNp1aEmOn0 SL1vz5gqRCuIuGuJ3EDlDCAiw7ggUdBvHgeulr6yU121U0b5eFJSVeYqSnIln4nVyQrtNo 74c7aJF9Ks8CWkLChQHxPmCIveHz02buii5hVOYVaRo2RG+/AQfaOyF4vvPB+3fbnEe+Qr vHhEwGV4EU2JCJGVbVrb18z6l81S6aNeLn40PW3XSfy0dzVVC8MXSQYf+KiRXugSBGI/+H tJOigsHv1MQ+Aiy6F/aG3nkoxygoXsSWsQ+0fY2E3/g0eUSR5cWTCba419eKVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724841074; 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=2bfTVEldryKbZa59bPNaaylOj1QAqVlKY4GPVYb0/fE=; b=sO9JrlmcBCqDVk0g7VKCuzCaSdWSatQOOPEWndw+H4Cr5aGR8Ix/PNO8knfzYgnSJAQXMP T274lmfHbFheWJNMxCLK14ygYwCYxmcZJ8qo01c/HtY1TM09MD93yflDLK7XhFxQ5wJuhk 56E4aX7zT1PYEiEOIt3VczCKQNSggbtJDR+y60gzayz77rGYoUplXpaWXV2biRgHhDSE9E +K62dVzDQWaSLq4fp25Gj5aU67TtUbgEq3xEgts3APAe6ecEap2uyk9zuqTM8MS+RbZjMu C7HSsXAgVL86+mHfUVSdK73q/uDteA4e0UvhVvQ2WjPiVlD9zNYMSNIfNqpYog== 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 4Wv10f2JfPzV8D; Wed, 28 Aug 2024 10:31:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47SAVEtV069038; Wed, 28 Aug 2024 10:31:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47SAVEb0069035; Wed, 28 Aug 2024 10:31:14 GMT (envelope-from git) Date: Wed, 28 Aug 2024 10:31:14 GMT Message-Id: <202408281031.47SAVEb0069035@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Nagy Subject: git: d0c3a2d4b6bf - main - www/{*chromium,iridium}: revert hardcoded paths that sneaked in 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rnagy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0c3a2d4b6bfcdd482143cde1f7e459461482e40 Auto-Submitted: auto-generated The branch main has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=d0c3a2d4b6bfcdd482143cde1f7e459461482e40 commit d0c3a2d4b6bfcdd482143cde1f7e459461482e40 Author: Robert Nagy AuthorDate: 2024-08-28 10:30:18 +0000 Commit: Robert Nagy CommitDate: 2024-08-28 10:31:10 +0000 www/{*chromium,iridium}: revert hardcoded paths that sneaked in PR: 281104 --- www/chromium/files/patch-build_rust_rust__bindgen.gni | 6 +++--- www/iridium/files/patch-build_rust_rust__bindgen.gni | 6 +++--- www/ungoogled-chromium/files/patch-build_rust_rust__bindgen.gni | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/www/chromium/files/patch-build_rust_rust__bindgen.gni b/www/chromium/files/patch-build_rust_rust__bindgen.gni index 90a5d9c25aea..41ce8114edd8 100644 --- a/www/chromium/files/patch-build_rust_rust__bindgen.gni +++ b/www/chromium/files/patch-build_rust_rust__bindgen.gni @@ -1,11 +1,11 @@ ---- build/rust/rust_bindgen.gni.orig 2024-08-26 12:06:38 UTC +--- build/rust/rust_bindgen.gni.orig 2024-07-30 19:22:51 UTC +++ build/rust/rust_bindgen.gni @@ -11,14 +11,14 @@ if (is_win) { import("//build/toolchain/win/win_toolchain_data.gni") } -_bindgen_path = "${rust_bindgen_root}/bin/bindgen" -+_bindgen_path = "/usr/local/bin/bindgen" ++_bindgen_path = "${LOCALBASE}/bin/bindgen" if (host_os == "win") { _bindgen_path = "${_bindgen_path}.exe" } @@ -13,7 +13,7 @@ # On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in # ../lib. -_libclang_path = rust_bindgen_root -+_libclang_path = "/usr/local/llvm17" ++_libclang_path = "${LOCALBASE}/llvm${MODCLANG_VERSION}" if (host_os == "win") { _libclang_path += "/bin" } else { diff --git a/www/iridium/files/patch-build_rust_rust__bindgen.gni b/www/iridium/files/patch-build_rust_rust__bindgen.gni index 75676be2d39c..e0d9446aeb7b 100644 --- a/www/iridium/files/patch-build_rust_rust__bindgen.gni +++ b/www/iridium/files/patch-build_rust_rust__bindgen.gni @@ -1,11 +1,11 @@ ---- build/rust/rust_bindgen.gni.orig 2024-08-27 06:28:16 UTC +--- build/rust/rust_bindgen.gni.orig 2024-08-01 05:47:53 UTC +++ build/rust/rust_bindgen.gni @@ -11,14 +11,14 @@ if (is_win) { import("//build/toolchain/win/win_toolchain_data.gni") } -_bindgen_path = "${rust_bindgen_root}/bin/bindgen" -+_bindgen_path = "/usr/local/bin/bindgen" ++_bindgen_path = "${LOCALBASE}/bin/bindgen" if (host_os == "win") { _bindgen_path = "${_bindgen_path}.exe" } @@ -13,7 +13,7 @@ # On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in # ../lib. -_libclang_path = rust_bindgen_root -+_libclang_path = "/usr/local/llvm17" ++_libclang_path = "${LOCALBASE}/llvm${MODCLANG_VERSION}" if (host_os == "win") { _libclang_path += "/bin" } else { diff --git a/www/ungoogled-chromium/files/patch-build_rust_rust__bindgen.gni b/www/ungoogled-chromium/files/patch-build_rust_rust__bindgen.gni index 54ae139bec4d..92cb9517d705 100644 --- a/www/ungoogled-chromium/files/patch-build_rust_rust__bindgen.gni +++ b/www/ungoogled-chromium/files/patch-build_rust_rust__bindgen.gni @@ -1,11 +1,11 @@ ---- build/rust/rust_bindgen.gni.orig 2024-08-26 14:40:28 UTC +--- build/rust/rust_bindgen.gni.orig 2024-07-31 14:19:23 UTC +++ build/rust/rust_bindgen.gni @@ -11,14 +11,14 @@ if (is_win) { import("//build/toolchain/win/win_toolchain_data.gni") } -_bindgen_path = "${rust_bindgen_root}/bin/bindgen" -+_bindgen_path = "/usr/local/bin/bindgen" ++_bindgen_path = "${LOCALBASE}/bin/bindgen" if (host_os == "win") { _bindgen_path = "${_bindgen_path}.exe" } @@ -13,7 +13,7 @@ # On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in # ../lib. -_libclang_path = rust_bindgen_root -+_libclang_path = "/usr/local/llvm17" ++_libclang_path = "${LOCALBASE}/llvm${MODCLANG_VERSION}" if (host_os == "win") { _libclang_path += "/bin" } else {