Attachment #189143 for bug #224622

View | Details | Raw Unified | Return to bug 224622
Collapse All | Expand All





PORTNAME=	chromium
PORTVERSION=	61.0.3163.100
PORTREVISION=	5
CATEGORIES?=	www
MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}


.if !defined(GN_ONLY)
BUILD_DEPENDS+=	gperf:devel/gperf \
		clang50:devel/llvm50 \
		yasm:devel/yasm \
		ffmpeg>=3.2.2,1:multimedia/ffmpeg \
		flock:sysutils/flock \

ALL_TARGET=	chrome
INSTALLS_ICONS=	yes

CC=		clang50
CXX=		clang++50
.endif

EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clang




-    ar = "${prefix}/llvm-ar"
-    nm = "${toolprefix}nm"
+    if (is_bsd) {
+      cc = "${toolprefix}clang50"
+      cxx = "${toolprefix}clang++50"
+      ld = cxx
+      readelf = "readelf"
+      ar = "${toolprefix}llvm-ar50"
+      nm = "${toolprefix}llvm-nm50"
+    } else {
+      prefix = rebase_path("$clang_base_path/bin", root_build_dir)
+      cc = "$prefix/clang"

Lines 16-22 LICENSE= BSD3CLAUSE LGPL21 MPL11 Link Here

(-)b/www/iridium/Makefile (-3 / +3 lines)
16	LICENSE_COMB= multi	16	LICENSE_COMB= multi
17		17
18	BUILD_DEPENDS= gperf:devel/gperf \	18	BUILD_DEPENDS= gperf:devel/gperf \
19	clang40:devel/llvm40 \	19	clang50:devel/llvm50 \
20	yasm:devel/yasm \	20	yasm:devel/yasm \
21	python:lang/python \	21	python:lang/python \
22	ffmpeg>=3.2.2,1:multimedia/ffmpeg \	22	ffmpeg>=3.2.2,1:multimedia/ffmpeg \
Lines 72-79 MAKE_ARGS= -C out/${BUILDTYPE} Link Here
72	ALL_TARGET= chrome	72	ALL_TARGET= chrome
73	INSTALLS_ICONS= yes	73	INSTALLS_ICONS= yes
74		74
75	CC= clang40	75	CC= clang50
76	CXX= clang++40	76	CXX= clang++50
77	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang	77	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang
78		78
79	# Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all variables.	79	# Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all variables.




-    cxx = "$prefix/clang++"
-    ld = cxx
+    if (is_bsd) {
+      cc = "${toolprefix}clang50"
+      cxx = "${toolprefix}clang++50"
+      ld = cxx
+      readelf = "readelf"
+      ar = "${toolprefix}llvm-ar50"
+      nm = "${toolprefix}llvm-nm50"
+    } else {
+      prefix = rebase_path("$clang_base_path/bin", root_build_dir)
+      cc = "$prefix/clang"

Return to bug 224622

Lines 24-35 Link Here

(-)b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni (-4 / +4 lines)
24	- ar = "${prefix}/llvm-ar"	24	- ar = "${prefix}/llvm-ar"
25	- nm = "${toolprefix}nm"	25	- nm = "${toolprefix}nm"
26	+ if (is_bsd) {	26	+ if (is_bsd) {
27	+ cc = "${toolprefix}clang40"	27	+ cc = "${toolprefix}clang50"
28	+ cxx = "${toolprefix}clang++40"	28	+ cxx = "${toolprefix}clang++50"
29	+ ld = cxx	29	+ ld = cxx
30	+ readelf = "readelf"	30	+ readelf = "readelf"
31	+ ar = "${toolprefix}llvm-ar40"	31	+ ar = "${toolprefix}llvm-ar50"
32	+ nm = "${toolprefix}llvm-nm40"	32	+ nm = "${toolprefix}llvm-nm50"
33	+ } else {	33	+ } else {
34	+ prefix = rebase_path("$clang_base_path/bin", root_build_dir)	34	+ prefix = rebase_path("$clang_base_path/bin", root_build_dir)
35	+ cc = "$prefix/clang"	35	+ cc = "$prefix/clang"

Lines 3-9 Link Here

(-)b/www/chromium/Makefile (-4 / +4 lines)
3		3
4	PORTNAME= chromium	4	PORTNAME= chromium
5	PORTVERSION= 61.0.3163.100	5	PORTVERSION= 61.0.3163.100
6	PORTREVISION= 4	6	PORTREVISION= 5
7	CATEGORIES?= www	7	CATEGORIES?= www
8	MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/	8	MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/
9	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}	9	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
Lines 21-27 BUILD_DEPENDS= python:lang/python \ Link Here
21		21
22	.if !defined(GN_ONLY)	22	.if !defined(GN_ONLY)
23	BUILD_DEPENDS+= gperf:devel/gperf \	23	BUILD_DEPENDS+= gperf:devel/gperf \
24	clang40:devel/llvm40 \	24	clang50:devel/llvm50 \
25	yasm:devel/yasm \	25	yasm:devel/yasm \
26	ffmpeg>=3.2.2,1:multimedia/ffmpeg \	26	ffmpeg>=3.2.2,1:multimedia/ffmpeg \
27	flock:sysutils/flock \	27	flock:sysutils/flock \
Lines 88-95 SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper Link Here
88	ALL_TARGET= chrome	88	ALL_TARGET= chrome
89	INSTALLS_ICONS= yes	89	INSTALLS_ICONS= yes
90		90
91	CC= clang40	91	CC= clang50
92	CXX= clang++40	92	CXX= clang++50
93	.endif	93	.endif
94		94
95	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang	95	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang

Lines 21-32 Link Here

(-)b/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni (-4 / +4 lines)
21	- cxx = "$prefix/clang++"	21	- cxx = "$prefix/clang++"
22	- ld = cxx	22	- ld = cxx
23	+ if (is_bsd) {	23	+ if (is_bsd) {
24	+ cc = "${toolprefix}clang40"	24	+ cc = "${toolprefix}clang50"
25	+ cxx = "${toolprefix}clang++40"	25	+ cxx = "${toolprefix}clang++50"
26	+ ld = cxx	26	+ ld = cxx
27	+ readelf = "readelf"	27	+ readelf = "readelf"
28	+ ar = "${toolprefix}llvm-ar40"	28	+ ar = "${toolprefix}llvm-ar50"
29	+ nm = "${toolprefix}llvm-nm40"	29	+ nm = "${toolprefix}llvm-nm50"
30	+ } else {	30	+ } else {
31	+ prefix = rebase_path("$clang_base_path/bin", root_build_dir)	31	+ prefix = rebase_path("$clang_base_path/bin", root_build_dir)
32	+ cc = "$prefix/clang"	32	+ cc = "$prefix/clang"