View | Details | Raw Unified | Return to bug 202609 | Differences between
and this patch

Collapse All | Expand All

(-)www/chromium/Makefile (-53 / +38 lines)
Lines 130-137 SUB_FILES= chromium-browser.desktop chrome Link Here
130
SUB_LIST+=	COMMENT="${COMMENT}"
130
SUB_LIST+=	COMMENT="${COMMENT}"
131
131
132
OPTIONS_DEFINE=	CODECS GCONF PULSEAUDIO TEST KERBEROS DEBUG DRIVER
132
OPTIONS_DEFINE=	CODECS GCONF PULSEAUDIO TEST KERBEROS DEBUG DRIVER
133
OPTIONS_DEFINE_amd64=	SSE2
134
OPTIONS_DEFINE_i386=	SSE2
135
OPTIONS_DEFAULT_amd64=	SSE2
136
OPTIONS_DEFAULT_i386=	${MACHINE_CPU:tu:MSSE2}
137
138
# Make COMPILER_TYPE:tu into an option helper
139
.include <bsd.compiler.mk> # XXX already on 11.0-CURRENT or base r265420
140
OPTIONS_SLAVE+=	${COMPILER_TYPE:tu}
141
133
CODECS_DESC=	Compile and enable patented codecs like H.264
142
CODECS_DESC=	Compile and enable patented codecs like H.264
134
DRIVER_DESC=	Install chromedriver
143
DRIVER_DESC=	Install chromedriver
144
SSE2_DESC=	${SSE_DESC:S/SSE/SSE2/}
135
145
136
OPTIONS_DEFAULT=	CODECS GCONF KERBEROS
146
OPTIONS_DEFAULT=	CODECS GCONF KERBEROS
137
OPTIONS_SUB=	yes
147
OPTIONS_SUB=	yes
Lines 141-172 PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/au Link Here
141
DRIVER_MAKE_ARGS=chromedriver
151
DRIVER_MAKE_ARGS=chromedriver
142
TEST_DISTFILES=	${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}
152
TEST_DISTFILES=	${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}
143
153
144
.include <bsd.port.options.mk>
154
CODECS_VARS=	GYP_DEFINES+=ffmpeg_branding=Chrome \
155
		GYP_DEFINES+=proprietary_codecs=1
156
CODECS_VARS_OFF=GYP_DEFINES+=ffmpeg_branding=Chromium \
157
		GYP_DEFINES+=proprietary_codecs=0
145
158
146
.if ${PORT_OPTIONS:MCODECS}
159
GCONF_VARS=	GYP_DEFINES+=use_gconf=1
147
GYP_DEFINES+=	ffmpeg_branding=Chrome
160
GCONF_VARS_OFF=	GYP_DEFINES+=use_gconf=0
148
GYP_DEFINES+=	proprietary_codecs=1
149
.else
150
GYP_DEFINES+=	ffmpeg_branding=Chromium
151
GYP_DEFINES+=	proprietary_codecs=0
152
.endif
153
161
154
.if ${PORT_OPTIONS:MGCONF}
162
PULSEAUDIO_VARS=	GYP_DEFINES+=use_pulseaudio=1
155
GYP_DEFINES+=	use_gconf=1
163
PULSEAUDIO_VARS_OFF=	GYP_DEFINES+=use_pulseaudio=0
156
.else
157
GYP_DEFINES+=	use_gconf=0
158
.endif
159
164
160
.if ${PORT_OPTIONS:MPULSEAUDIO}
165
SSE2_VARS_OFF=	GYP_DEFINES+=disable_sse2=1
161
GYP_DEFINES+=	use_pulseaudio=1
162
.else
163
GYP_DEFINES+=	use_pulseaudio=0
164
.endif
165
166
166
.if ! ${MACHINE_CPU:Msse2}
167
GYP_DEFINES+=	disable_sse2=1
168
.endif
169
170
.if !exists(/usr/libdata/pkgconfig/libusb-1.0.pc)
167
.if !exists(/usr/libdata/pkgconfig/libusb-1.0.pc)
171
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libusb-pc
168
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libusb-pc
172
.endif
169
.endif
Lines 177-193 CFLAGS+= -fno-omit-frame-pointer Link Here
177
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-fixup-ffmpeg
174
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-fixup-ffmpeg
178
.endif
175
.endif
179
176
180
.if ${PORT_OPTIONS:MTEST}
181
.include "Makefile.tests"
177
.include "Makefile.tests"
182
ALL_TARGET+=	${TEST_TARGETS}
178
TEST_ALL_TARGET=${TEST_TARGETS}
183
.endif
179
TEST_VARS=	RUN_TESTS="${TEST_TARGETS}"
184
180
185
DEBUG_MAKE_ENV=	V=1
181
DEBUG_MAKE_ENV=	V=1
186
.if ${PORT_OPTIONS:MDEBUG}
182
DEBUG_VARS=	BUILDTYPE=Debug \
187
BUILDTYPE=	Debug
183
		WANTSPACE="lots of free diskspace (~ 8.5GB)"
188
.else
184
DEBUG_VARS_OFF=	BUILDTYPE=Release \
189
BUILDTYPE=	Release
185
		WANTSPACE="a fair amount of free diskspace (~ 3.7GB)"
190
.endif
191
186
192
CONFIGURE_ENV+=	CC="${CC}" \
187
CONFIGURE_ENV+=	CC="${CC}" \
193
		CXX="${CXX}" \
188
		CXX="${CXX}" \
Lines 196-217 CONFIGURE_ENV+= CC="${CC}" \ Link Here
196
MAKE_ENV+=	BUILDTYPE=${BUILDTYPE} \
191
MAKE_ENV+=	BUILDTYPE=${BUILDTYPE} \
197
		GPERF="${LOCALBASE}/bin/gperf"
192
		GPERF="${LOCALBASE}/bin/gperf"
198
193
199
.include <bsd.port.pre.mk>
194
CLANG_VARS=	GYP_DEFINES+=clang=1
195
CLANG_CFLAGS=	-Wno-unknown-warning-option
196
CLANG_EXTRA_PATCHES=	${FILESDIR}/extra-patch-clang
197
CLANG_CONFIGURE_ENV=	AR=/usr/bin/ar
200
198
201
.if ${CHOSEN_COMPILER_TYPE} == gcc
199
GCC_VARS=	GYP_DEFINES+=gcc_version=${CXX:S/g++//}
202
GYP_DEFINES+=	gcc_version=${CXX:S/g++//}
200
GCC_EXTRA_PATCHES=	${FILESDIR}/extra-patch-gcc
203
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-gcc
201
GCC_CFLAGS=	-fno-stack-protector # gcc 4.8 cannot find __stack_chk_fail_local
204
CFLAGS+=	-fno-stack-protector # gcc 4.8 cannot find __stack_chk_fail_local
205
.else
206
GYP_DEFINES+=	clang=1
207
CFLAGS+=	-Wno-unknown-warning-option
208
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clang
209
CONFIGURE_ENV+=	AR=/usr/bin/ar
210
.endif
211
202
212
.if ! ${PORT_OPTIONS:MKERBEROS}
203
KERBEROS_VARS_OFF=	GYP_DEFINES+=use_kerberos=0
213
GYP_DEFINES+=	use_kerberos=0
214
.endif
215
204
216
# according to portlint the below is passed via bsd.port.mk,
205
# according to portlint the below is passed via bsd.port.mk,
217
# but 'make -V CONFIGURE_ENV' does not show it:
206
# but 'make -V CONFIGURE_ENV' does not show it:
Lines 223-233 CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ Link Here
223
pre-everything::
212
pre-everything::
224
	@${ECHO_MSG}
213
	@${ECHO_MSG}
225
	@${ECHO_MSG} "To build Chromium, you should have around 2 GB of memory"
214
	@${ECHO_MSG} "To build Chromium, you should have around 2 GB of memory"
226
.if ${PORT_OPTIONS:MDEBUG}
215
	@${ECHO_MSG} "and ${WANTSPACE}."
227
	@${ECHO_MSG} "and lots of free diskspace (~ 8.5GB)."
228
.else
229
	@${ECHO_MSG} "and a fair amount of free diskspace (~ 3.7GB)."
230
.endif
231
	@${ECHO_MSG}
216
	@${ECHO_MSG}
232
	@${ECHO_MSG} "Make sure you have Python build with the SEM option ON"
217
	@${ECHO_MSG} "Make sure you have Python build with the SEM option ON"
233
	@${ECHO_MSG} "(default in python27-2.7.8 since r361735)"
218
	@${ECHO_MSG} "(default in python27-2.7.8 since r361735)"
Lines 351-357 do-configure: Link Here
351
		./build/gyp_chromium chrome/chrome.gyp --depth .
336
		./build/gyp_chromium chrome/chrome.gyp --depth .
352
337
353
test regression-test: build
338
test regression-test: build
354
.for t in ${TEST_TARGETS}
339
.for t in ${RUN_TESTS}
355
	cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \
340
	cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \
356
		./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE}
341
		./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE}
357
.endfor
342
.endfor
Lines 380-388 do-install: Link Here
380
	${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin
365
	${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin
381
	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/mksnapshot \
366
	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/mksnapshot \
382
		${STAGEDIR}${DATADIR}
367
		${STAGEDIR}${DATADIR}
383
.if ${PORT_OPTIONS:MDRIVER}
368
369
post-install-DRIVER-on:
384
	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \
370
	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \
385
		${STAGEDIR}${PREFIX}/bin
371
		${STAGEDIR}${PREFIX}/bin
386
.endif
387
372
388
.include <bsd.port.post.mk>
373
.include <bsd.port.mk>

Return to bug 202609