Attachment 189143 Details for Bug 224622 – v0

[patch] v0

chromium.llvm50.diff (text/plain), 3.81 KB, created by Jan Beich on 2017-12-27 22:56:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2017-12-27 22:56:34 UTC

Size: 3.81 KB

patch

obsolete

>From 468bc7acb9ce586aeca15437c77b371617305312 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Wed, 27 Dec 2017 16:14:06 +0000
>Subject: [PATCH] www/chromium, www/iridium: switch to llvm50 (like r457360)
>
>PR:		224622
>Approved by:	chromium (?) !!! NOT YET !!!
>---
> www/chromium/Makefile                                       | 8 ++++----
> www/chromium/files/patch-build_toolchain_gcc__toolchain.gni | 8 ++++----
> www/iridium/Makefile                                        | 6 +++---
> www/iridium/files/patch-build_toolchain_gcc__toolchain.gni  | 8 ++++----
> 4 files changed, 15 insertions(+), 15 deletions(-)
>
>diff --git a/www/chromium/Makefile b/www/chromium/Makefile
>index c4dcf1326b15..17ca75be889d 100644
>--- a/www/chromium/Makefile
>+++ b/www/chromium/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	chromium
> PORTVERSION=	61.0.3163.100
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES?=	www
> MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
>@@ -21,7 +21,7 @@ BUILD_DEPENDS=	python:lang/python \
> 
> .if !defined(GN_ONLY)
> BUILD_DEPENDS+=	gperf:devel/gperf \
>-		clang40:devel/llvm40 \
>+		clang50:devel/llvm50 \
> 		yasm:devel/yasm \
> 		ffmpeg>=3.2.2,1:multimedia/ffmpeg \
> 		flock:sysutils/flock \
>@@ -88,8 +88,8 @@ SHEBANG_FILES=	chrome/tools/build/linux/chrome-wrapper
> ALL_TARGET=	chrome
> INSTALLS_ICONS=	yes
> 
>-CC=		clang40
>-CXX=		clang++40
>+CC=		clang50
>+CXX=		clang++50
> .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 9d9ebcde2d12..78619a75fb9b 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}clang40"
>-+      cxx = "${toolprefix}clang++40"
>++      cc = "${toolprefix}clang50"
>++      cxx = "${toolprefix}clang++50"
> +      ld = cxx
> +      readelf = "readelf"
>-+      ar = "${toolprefix}llvm-ar40"
>-+      nm = "${toolprefix}llvm-nm40"
>++      ar = "${toolprefix}llvm-ar50"
>++      nm = "${toolprefix}llvm-nm50"
> +    } 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 31a78bcaa235..0e91fb4843f7 100644
>--- a/www/iridium/Makefile
>+++ b/www/iridium/Makefile
>@@ -16,7 +16,7 @@ LICENSE=	BSD3CLAUSE LGPL21 MPL11
> LICENSE_COMB=	multi
> 
> BUILD_DEPENDS=	gperf:devel/gperf \
>-		clang40:devel/llvm40 \
>+		clang50:devel/llvm50 \
> 		yasm:devel/yasm \
> 		python:lang/python \
> 		ffmpeg>=3.2.2,1:multimedia/ffmpeg \
>@@ -72,8 +72,8 @@ MAKE_ARGS=	-C out/${BUILDTYPE}
> ALL_TARGET=	chrome
> INSTALLS_ICONS=	yes
> 
>-CC=		clang40
>-CXX=		clang++40
>+CC=		clang50
>+CXX=		clang++50
> 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 d86f449a1094..aae17684e987 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}clang40"
>-+      cxx = "${toolprefix}clang++40"
>++      cc = "${toolprefix}clang50"
>++      cxx = "${toolprefix}clang++50"
> +      ld = cxx
> +      readelf = "readelf"
>-+      ar = "${toolprefix}llvm-ar40"
>-+      nm = "${toolprefix}llvm-nm40"
>++      ar = "${toolprefix}llvm-ar50"
>++      nm = "${toolprefix}llvm-nm50"
> +    } else {
> +      prefix = rebase_path("$clang_base_path/bin", root_build_dir)
> +      cc = "$prefix/clang"

Flags:

cpm: maintainer-approval+

Actions: View | Diff

Attachments on bug 224622: 189143