Attachment #192717 for bug #227683

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

Lines 20-26 BUILD_DEPENDS= bash:shells/bash \ Link Here

(-)b/www/chromium/Makefile (-3 / +3 lines)
20		20
21	.if !defined(GN_ONLY)	21	.if !defined(GN_ONLY)
22	BUILD_DEPENDS+= gperf:devel/gperf \	22	BUILD_DEPENDS+= gperf:devel/gperf \
23	clang50:devel/llvm50 \	23	clang60:devel/llvm60 \
24	yasm:devel/yasm \	24	yasm:devel/yasm \
25	ffmpeg>=3.2.2,1:multimedia/ffmpeg \	25	ffmpeg>=3.2.2,1:multimedia/ffmpeg \
26	flock:sysutils/flock \	26	flock:sysutils/flock \
Lines 91-98 SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper Link Here
91	ALL_TARGET= chrome	91	ALL_TARGET= chrome
92	INSTALLS_ICONS= yes	92	INSTALLS_ICONS= yes
93		93
94	CC= clang50	94	CC= clang60
95	CXX= clang++50	95	CXX= clang++60
96	.endif	96	.endif
97		97
98	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang	98	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang




-    ar = "${prefix}/llvm-ar"
-    nm = "${toolprefix}nm"
+    if (is_bsd) {
+      cc = "${toolprefix}clang60"
+      cxx = "${toolprefix}clang++60"
+      ld = cxx
+      readelf = "readelf"
+      ar = "${toolprefix}llvm-ar60"
+      nm = "${toolprefix}llvm-nm60"
+    } else {
+      prefix = rebase_path("$clang_base_path/bin", root_build_dir)
+      cc = "$prefix/clang"





PORTNAME=	iridium
PORTVERSION=	58.0
PORTREVISION=	14
CATEGORIES=	www
MASTER_SITES=	https://downloads.iridiumbrowser.de/source/
PKGNAMESUFFIX=	-browser

LICENSE_COMB=	multi

BUILD_DEPENDS=	gperf:devel/gperf \
		clang60:devel/llvm60 \
		yasm:devel/yasm \
		ffmpeg>=3.2.2,1:multimedia/ffmpeg \
		bash:shells/bash \

INSTALLS_ICONS=	yes
BINARY_ALIAS=	python=${PYTHON_CMD}

CC=		clang60
CXX=		clang++60
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clang

# Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all variables.




-    cxx = "$prefix/clang++"
-    ld = cxx
+    if (is_bsd) {
+      cc = "${toolprefix}clang60"
+      cxx = "${toolprefix}clang++60"
+      ld = cxx
+      readelf = "readelf"
+      ar = "${toolprefix}llvm-ar60"
+      nm = "${toolprefix}llvm-nm60"
+    } else {
+      prefix = rebase_path("$clang_base_path/bin", root_build_dir)
+      cc = "$prefix/clang"

 
     if (use_clang_static_analyzer) {
       # Static analysis isn't supported under GOMA. See crbug.com/687245
@@ -607,10 +524,6 @@ template("clang_toolchain") {
                         root_build_dir)
     }
 





PORTNAME=	webengine
DISTVERSION=	${QT5_VERSION}
PORTREVISION=	2
CATEGORIES=	www
PKGNAMEPREFIX=	qt5-


.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-10

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.

Return to bug 227683

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}clang50"	27	+ cc = "${toolprefix}clang60"
28	+ cxx = "${toolprefix}clang++50"	28	+ cxx = "${toolprefix}clang++60"
29	+ ld = cxx	29	+ ld = cxx
30	+ readelf = "readelf"	30	+ readelf = "readelf"
31	+ ar = "${toolprefix}llvm-ar50"	31	+ ar = "${toolprefix}llvm-ar60"
32	+ nm = "${toolprefix}llvm-nm50"	32	+ nm = "${toolprefix}llvm-nm60"
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/iridium/Makefile (-4 / +4 lines)
3		3
4	PORTNAME= iridium	4	PORTNAME= iridium
5	PORTVERSION= 58.0	5	PORTVERSION= 58.0
6	PORTREVISION= 13	6	PORTREVISION= 14
7	CATEGORIES= www	7	CATEGORIES= www
8	MASTER_SITES= https://downloads.iridiumbrowser.de/source/	8	MASTER_SITES= https://downloads.iridiumbrowser.de/source/
9	PKGNAMESUFFIX= -browser	9	PKGNAMESUFFIX= -browser
Lines 16-22 LICENSE= BSD3CLAUSE LGPL21 MPL11 Link Here
16	LICENSE_COMB= multi	16	LICENSE_COMB= multi
17		17
18	BUILD_DEPENDS= gperf:devel/gperf \	18	BUILD_DEPENDS= gperf:devel/gperf \
19	clang50:devel/llvm50 \	19	clang60:devel/llvm60 \
20	yasm:devel/yasm \	20	yasm:devel/yasm \
21	ffmpeg>=3.2.2,1:multimedia/ffmpeg \	21	ffmpeg>=3.2.2,1:multimedia/ffmpeg \
22	bash:shells/bash \	22	bash:shells/bash \
Lines 71-78 ALL_TARGET= chrome Link Here
71	INSTALLS_ICONS= yes	71	INSTALLS_ICONS= yes
72	BINARY_ALIAS= python=${PYTHON_CMD}	72	BINARY_ALIAS= python=${PYTHON_CMD}
73		73
74	CC= clang50	74	CC= clang60
75	CXX= clang++50	75	CXX= clang++60
76	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang	76	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang
77		77
78	# Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all variables.	78	# Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all variables.

Lines 21-32 Link Here

(-)b/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni (-5 / +5 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}clang50"	24	+ cc = "${toolprefix}clang60"
25	+ cxx = "${toolprefix}clang++50"	25	+ cxx = "${toolprefix}clang++60"
26	+ ld = cxx	26	+ ld = cxx
27	+ readelf = "readelf"	27	+ readelf = "readelf"
28	+ ar = "${toolprefix}llvm-ar50"	28	+ ar = "${toolprefix}llvm-ar60"
29	+ nm = "${toolprefix}llvm-nm50"	29	+ nm = "${toolprefix}llvm-nm60"
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"
Lines 39-45 Link Here
39		39
40	if (use_clang_static_analyzer) {	40	if (use_clang_static_analyzer) {
41	# Static analysis isn't supported under GOMA. See crbug.com/687245	41	# Static analysis isn't supported under GOMA. See crbug.com/687245
42	@@ -507,10 +524,6 @@ template("clang_toolchain") {	42	@@ -607,10 +524,6 @@ template("clang_toolchain") {
43	root_build_dir)	43	root_build_dir)
44	}	44	}
45		45

Lines 16-22 Link Here

(-)b/www/qt5-webengine/Makefile (-4 / +4 lines)
16		16
17	PORTNAME= webengine	17	PORTNAME= webengine
18	DISTVERSION= ${QT5_VERSION}	18	DISTVERSION= ${QT5_VERSION}
19	PORTREVISION= 1	19	PORTREVISION= 2
20	CATEGORIES= www	20	CATEGORIES= www
21	PKGNAMEPREFIX= qt5-	21	PKGNAMEPREFIX= qt5-
22		22
Lines 81-89 ALL_TARGET= first Link Here
81	.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000	81	.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000
82	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-10	82	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-10
83		83
84	BUILD_DEPENDS+= clang50:devel/llvm50	84	BUILD_DEPENDS+= clang60:devel/llvm60
85	CC= clang50	85	CC= clang60
86	CXX= clang++50	86	CXX= clang++60
87	.endif # ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000	87	.endif # ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000
88		88
89	# We need ar(1) from ports because the Chromium code uses the @file syntax.	89	# We need ar(1) from ports because the Chromium code uses the @file syntax.