From nobody Sat Mar 19 11:08:21 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 B01571A12AFE; Sat, 19 Mar 2022 11:08:21 +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 4KLJ5d4Tysz4pWp; Sat, 19 Mar 2022 11:08:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647688101; 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=cniGM96q1t2pn6b8ER49qrqiZVm4Do2fDVSaC7cNAfE=; b=Uu3FtLpE/KJiBfO9Y1+gOpEQV+T2TlbhNxm93Y1cAAQ7AyTsHegBmXmvhWyjXvp7hIxj82 GVM15KkRoNvYMtxJdH6eI5npmWEQCrVlFFfXCN6vUDgsfr3EpCMQlJgjA6+wpa1fn5l1Bt yog9MfnGL7eQmec5jpF6BywhbuA7OwsgWN+2khZh6UkJIH66pVX8iU8jbyy1iFocQLJ1G/ FqHNDZie+iqBD3CSxHzAB7E961yijhH6fUdudwTxPUBA/rVcaO96CbP71JpIK76KUWeHy0 6JhJHHqLQTEmnvGg9jKyvpdshMae3NBy6Sg51OFtAg40D0YUzLnfvKy17E+Ukw== 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 7AB8D121A8; Sat, 19 Mar 2022 11:08:21 +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 22JB8LtH053017; Sat, 19 Mar 2022 11:08:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22JB8LUC053016; Sat, 19 Mar 2022 11:08:21 GMT (envelope-from git) Date: Sat, 19 Mar 2022 11:08:21 GMT Message-Id: <202203191108.22JB8LUC053016@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: 5ca73f824fd9 - 2022Q1 - www/chromium: allow building with LTO on FreeBSD < 13.1 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: 5ca73f824fd9fc2827f900ffe7c3f8ff0c03ba28 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647688101; 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=cniGM96q1t2pn6b8ER49qrqiZVm4Do2fDVSaC7cNAfE=; b=strsUtxRhuQEltyKcKMElDbjfqJLvxSznOVVRdDj5a9v8WnS9IxlbKNHA8WXaNylesM/jH AUtl6QzCv1E2/sb3sSWzBtNkCVVzAQBC1hw6vxM1GZ6sqYn+UXBjxuU88QEC5UmpyA9hCG 9mbGKannQD9Zhft4+DckB0kFYjm+rvKlYgiEE4OnL5ZdJ66REiPiyBinExsxJj9Btc6i46 AWErdaJ4LTci7hidjgxGe0IWPSvZjMVWvCMLJPi8KqqmOZ2AXABaDT7js1TqXpJdSf1F7e U/ppK7JVfRhT+sgNugmzwgOGoNm2R/iMVnEO9cgGZW7ON5eyzwRczcIU1zBm+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647688101; a=rsa-sha256; cv=none; b=hz7a9jZBtlVOOFdMXceSonT4/8crwKX9B+IzqpPyPbm1yvvb8SKkEy4NEJGtylP1N4hFNa KYgAt9UHEvl1UnBccjDpityn018RbR1qvnU0T1gKs1bhNOx/C/pty8W0T2ucQWQLGzduFA hHJl0R/dVMpCe084RLkkWWFc3Aqw6dKpKZkrUCh2WRXnFjwgH2k405Ywi56g/P2AKj5Rda m8fI6SS9rqjvOw8EvrNt3XEKTQHuinfoZTS2dyhPwaQZvBBMMCMcJUXMb1+EOXQSOdPLoU 26+4UijAXx6fEl0EL6thN7vVxnWCtm2DksiP9ebpR5HwQqygzyh8ksYMmL3kSQ== 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=5ca73f824fd9fc2827f900ffe7c3f8ff0c03ba28 commit 5ca73f824fd9fc2827f900ffe7c3f8ff0c03ba28 Author: Robert Nagy AuthorDate: 2022-03-19 10:56:48 +0000 Commit: Rene Ladan CommitDate: 2022-03-19 11:08:12 +0000 www/chromium: allow building with LTO on FreeBSD < 13.1 (cherry picked from commit e0337a8a3562485ec515325ba83b2a0015721a55) --- www/chromium/Makefile | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 246377cf90a7..9708df9d5c33 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -13,7 +13,7 @@ COMMENT= Google web browser based on WebKit LICENSE= BSD3CLAUSE LGPL21 MPL11 LICENSE_COMB= multi -ONLY_FOR_ARCHS= aarch64 amd64 i386 +ONLY_FOR_ARCHS= aarch64 amd64 i386 BUILD_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ @@ -78,9 +78,7 @@ SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang- MAKE_ARGS= -C out/${BUILDTYPE} ALL_TARGET= chrome -BINARY_ALIAS= ar=/usr/bin/llvm-ar \ - nm=/usr/bin/llvm-nm \ - python3=${PYTHON_CMD} +BINARY_ALIAS= python3=${PYTHON_CMD} # TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn) # @@ -127,7 +125,7 @@ GN_ARGS+= google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8" SUB_FILES= chromium-browser.desktop chrome SUB_LIST+= COMMENT="${COMMENT}" -OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER KERBEROS LTO TEST +OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER KERBEROS LTO TEST OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS SNDIO OPTIONS_EXCLUDE_aarch64=LTO OPTIONS_GROUP= AUDIO @@ -205,11 +203,18 @@ TEST_ALL_TARGET= ${TEST_TARGETS} IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base .endif -.if ${COMPILER_VERSION} < 120 - -.if ${PORT_OPTIONS:MLTO} -BROKEN+= does not build with LTO needs LLVM 12+ -.endif +.if ${COMPILER_VERSION} < 130 && ${PORT_OPTIONS:MLTO} +LLVM_DEFAULT= 13 +BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} +BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \ + cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \ + c++=${LOCALBASE}/bin/clang++${LLVM_DEFAULT} \ + ar=${LOCALBASE}/bin/llvm-ar${LLVM_DEFAULT} \ + nm=${LOCALBASE}/bin/llvm-nm${LLVM_DEFAULT} \ + ld=${LOCALBASE}/bin/ld.lld${LLVM_DEFAULT} +.else +BINARY_ALIAS+= ar=/usr/bin/llvm-ar \ + nm=/usr/bin/llvm-nm .endif # swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only