diff options
| author | Robert Nagy <robert@openbsd.org> | 2022-03-07 17:43:44 +0100 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2022-03-07 17:46:27 +0100 |
| commit | ce8f53fa4f441a63306fb099a0dc8d9c0e956e46 (patch) | |
| tree | d7e6b65545c6f3626aa8854735ea6c8b40610afc | |
| parent | finance/ktoblzcheck: Update bank data (diff) | |
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)
| -rw-r--r-- | www/chromium/Makefile | 7 | ||||
| -rw-r--r-- | www/chromium/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, [ |