Attachment 192717 Details for Bug 227683 – v0

[patch] v0

chromium.clang60.diff (text/plain), 4.76 KB, created by Jan Beich on 2018-04-22 06:07:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2018-04-22 06:07:03 UTC

Size: 4.76 KB

patch

obsolete

>From f7bc0ee8b8b3aa705bf30037711068239f16a5ce Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Sun, 22 Apr 2018 06:03:36 +0000
>Subject: [PATCH] www/chromium: switch to llvm60
>
>PR:		227683
>Approved by:	?
>---
> www/chromium/Makefile                                  |  6 +++---
> .../files/patch-build_toolchain_gcc__toolchain.gni     |  8 ++++----
> www/iridium/Makefile                                   |  8 ++++----
> .../files/patch-build_toolchain_gcc__toolchain.gni     | 10 +++++-----
> www/qt5-webengine/Makefile                             |  8 ++++----
> 5 files changed, 20 insertions(+), 20 deletions(-)
>
>diff --git a/www/chromium/Makefile b/www/chromium/Makefile
>index ddf5a12b605a..b470b5a44423 100644
>--- a/www/chromium/Makefile
>+++ b/www/chromium/Makefile
>@@ -20,7 +20,7 @@ BUILD_DEPENDS=	bash:shells/bash \
> 
> .if !defined(GN_ONLY)
> BUILD_DEPENDS+=	gperf:devel/gperf \
>-		clang50:devel/llvm50 \
>+		clang60:devel/llvm60 \
> 		yasm:devel/yasm \
> 		ffmpeg>=3.2.2,1:multimedia/ffmpeg \
> 		flock:sysutils/flock \
>@@ -91,8 +91,8 @@ SHEBANG_FILES=	chrome/tools/build/linux/chrome-wrapper
> ALL_TARGET=	chrome
> INSTALLS_ICONS=	yes
> 
>-CC=		clang50
>-CXX=		clang++50
>+CC=		clang60
>+CXX=		clang++60
> .endif
> 
> EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clang
>diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
>index 78619a75fb9b..1e59c7000b4c 100644
>--- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
>+++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
>@@ -24,12 +24,12 @@
> -    ar = "${prefix}/llvm-ar"
> -    nm = "${toolprefix}nm"
> +    if (is_bsd) {
>-+      cc = "${toolprefix}clang50"
>-+      cxx = "${toolprefix}clang++50"
>++      cc = "${toolprefix}clang60"
>++      cxx = "${toolprefix}clang++60"
> +      ld = cxx
> +      readelf = "readelf"
>-+      ar = "${toolprefix}llvm-ar50"
>-+      nm = "${toolprefix}llvm-nm50"
>++      ar = "${toolprefix}llvm-ar60"
>++      nm = "${toolprefix}llvm-nm60"
> +    } else {
> +      prefix = rebase_path("$clang_base_path/bin", root_build_dir)
> +      cc = "$prefix/clang"
>diff --git a/www/iridium/Makefile b/www/iridium/Makefile
>index 0e8be73fd87a..3e569fa81cd8 100644
>--- a/www/iridium/Makefile
>+++ b/www/iridium/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	iridium
> PORTVERSION=	58.0
>-PORTREVISION=	13
>+PORTREVISION=	14
> CATEGORIES=	www
> MASTER_SITES=	https://downloads.iridiumbrowser.de/source/
> PKGNAMESUFFIX=	-browser
>@@ -16,7 +16,7 @@ LICENSE=	BSD3CLAUSE LGPL21 MPL11
> LICENSE_COMB=	multi
> 
> BUILD_DEPENDS=	gperf:devel/gperf \
>-		clang50:devel/llvm50 \
>+		clang60:devel/llvm60 \
> 		yasm:devel/yasm \
> 		ffmpeg>=3.2.2,1:multimedia/ffmpeg \
> 		bash:shells/bash \
>@@ -71,8 +71,8 @@ ALL_TARGET=	chrome
> INSTALLS_ICONS=	yes
> BINARY_ALIAS=	python=${PYTHON_CMD}
> 
>-CC=		clang50
>-CXX=		clang++50
>+CC=		clang60
>+CXX=		clang++60
> EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clang
> 
> # Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all variables.
>diff --git a/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni b/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni
>index aae17684e987..d55be9a82554 100644
>--- a/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni
>+++ b/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni
>@@ -21,12 +21,12 @@
> -    cxx = "$prefix/clang++"
> -    ld = cxx
> +    if (is_bsd) {
>-+      cc = "${toolprefix}clang50"
>-+      cxx = "${toolprefix}clang++50"
>++      cc = "${toolprefix}clang60"
>++      cxx = "${toolprefix}clang++60"
> +      ld = cxx
> +      readelf = "readelf"
>-+      ar = "${toolprefix}llvm-ar50"
>-+      nm = "${toolprefix}llvm-nm50"
>++      ar = "${toolprefix}llvm-ar60"
>++      nm = "${toolprefix}llvm-nm60"
> +    } else {
> +      prefix = rebase_path("$clang_base_path/bin", root_build_dir)
> +      cc = "$prefix/clang"
>@@ -39,7 +39,7 @@
>  
>      if (use_clang_static_analyzer) {
>        # Static analysis isn't supported under GOMA. See crbug.com/687245
>-@@ -507,10 +524,6 @@ template("clang_toolchain") {
>+@@ -607,10 +524,6 @@ template("clang_toolchain") {
>                          root_build_dir)
>      }
>  
>diff --git a/www/qt5-webengine/Makefile b/www/qt5-webengine/Makefile
>index d1bd66c96a83..e9774c0e5496 100644
>--- a/www/qt5-webengine/Makefile
>+++ b/www/qt5-webengine/Makefile
>@@ -16,7 +16,7 @@
> 
> PORTNAME=	webengine
> DISTVERSION=	${QT5_VERSION}
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www
> PKGNAMEPREFIX=	qt5-
> 
>@@ -81,9 +81,9 @@ ALL_TARGET=	first
> .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000
> EXTRA_PATCHES+=	${FILESDIR}/extra-patch-10
> 
>-BUILD_DEPENDS+=	clang50:devel/llvm50
>-CC=		clang50
>-CXX=		clang++50
>+BUILD_DEPENDS+=	clang60:devel/llvm60
>+CC=		clang60
>+CXX=		clang++60
> .endif  # ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000
> 
> # We need ar(1) from ports because the Chromium code uses the @file syntax.

Actions: View | Diff

Attachments on bug 227683: 192717