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

Collapse All | Expand All

(-)www/chromium/Makefile (-53 / +42 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
# Custom variables for option helpers
139
_OPTIONS_FLAGS=	BUILDTYPE GYP_DEFINES RUN_TESTS WANTSPACE
140
141
# Convert option helpers into compiler-type helpers
142
#OPTIONS_DEFINE+=	${COMPILER_TYPE:tu} # not required
143
OPTIONS_SLAVE+=		${COMPILER_TYPE:tu}
144
133
CODECS_DESC=	Compile and enable patented codecs like H.264
145
CODECS_DESC=	Compile and enable patented codecs like H.264
134
DRIVER_DESC=	Install chromedriver
146
DRIVER_DESC=	Install chromedriver
147
SSE2_DESC=	${SSE_DESC:S/SSE/SSE2/}
135
148
136
OPTIONS_DEFAULT=	CODECS GCONF KERBEROS
149
OPTIONS_DEFAULT=	CODECS GCONF KERBEROS
137
OPTIONS_SUB=	yes
150
OPTIONS_SUB=	yes
Lines 139-172 OPTIONS_SUB= yes Link Here
139
GCONF_USE=	GNOME=gconf2
152
GCONF_USE=	GNOME=gconf2
140
PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
153
PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
141
DRIVER_MAKE_ARGS=chromedriver
154
DRIVER_MAKE_ARGS=chromedriver
155
142
TEST_DISTFILES=	${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}
156
TEST_DISTFILES=	${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}
143
157
144
.include <bsd.port.options.mk>
158
CODECS_GYP_DEFINES=		ffmpeg_branding=Chrome \
159
				proprietary_codecs=1
160
CODECS_GYP_DEFINES_OFF=		ffmpeg_branding=Chromium \
161
				proprietary_codecs=0
145
162
146
.if ${PORT_OPTIONS:MCODECS}
163
GCONF_GYP_DEFINES=		use_gconf=1
147
GYP_DEFINES+=	ffmpeg_branding=Chrome
164
GCONF_GYP_DEFINES_OFF=		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
165
154
.if ${PORT_OPTIONS:MGCONF}
166
PULSEAUDIO_GYP_DEFINES=		use_pulseaudio=1
155
GYP_DEFINES+=	use_gconf=1
167
PULSEAUDIO_GYP_DEFINES_OFF=	use_pulseaudio=0
156
.else
157
GYP_DEFINES+=	use_gconf=0
158
.endif
159
168
160
.if ${PORT_OPTIONS:MPULSEAUDIO}
169
SSE2_GYP_DEFINES_OFF=	disable_sse2=1
161
GYP_DEFINES+=	use_pulseaudio=1
162
.else
163
GYP_DEFINES+=	use_pulseaudio=0
164
.endif
165
170
166
.if ! ${MACHINE_CPU:Msse2}
167
GYP_DEFINES+=	disable_sse2=1
168
.endif
169
170
.if !exists(/usr/libdata/pkgconfig/libusb-1.0.pc)
171
.if !exists(/usr/libdata/pkgconfig/libusb-1.0.pc)
171
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libusb-pc
172
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libusb-pc
172
.endif
173
.endif
Lines 177-193 CFLAGS+= -fno-omit-frame-pointer Link Here
177
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-fixup-ffmpeg
178
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-fixup-ffmpeg
178
.endif
179
.endif
179
180
180
.if ${PORT_OPTIONS:MTEST}
181
.include "Makefile.tests"
181
.include "Makefile.tests"
182
ALL_TARGET+=	${TEST_TARGETS}
182
TEST_ALL_TARGET=	${TEST_TARGETS}
183
.endif
183
TEST_RUN_TESTS=		${TEST_TARGETS}
184
184
185
DEBUG_MAKE_ENV=	V=1
185
DEBUG_MAKE_ENV=	V=1
186
.if ${PORT_OPTIONS:MDEBUG}
186
DEBUG_BUILDTYPE=	Debug
187
BUILDTYPE=	Debug
187
DEBUG_BUILDTYPE_OFF=	Release
188
.else
188
DEBUG_WANTSPACE=	lots of free diskspace (~ 8.5GB)
189
BUILDTYPE=	Release
189
DEBUG_WANTSPACE_OFF=	a fair amount of free diskspace (~ 3.7GB)
190
.endif
191
190
192
CONFIGURE_ENV+=	CC="${CC}" \
191
CONFIGURE_ENV+=	CC="${CC}" \
193
		CXX="${CXX}" \
192
		CXX="${CXX}" \
Lines 196-217 CONFIGURE_ENV+= CC="${CC}" \ Link Here
196
MAKE_ENV+=	BUILDTYPE=${BUILDTYPE} \
195
MAKE_ENV+=	BUILDTYPE=${BUILDTYPE} \
197
		GPERF="${LOCALBASE}/bin/gperf"
196
		GPERF="${LOCALBASE}/bin/gperf"
198
197
199
.include <bsd.port.pre.mk>
198
CLANG_GYP_DEFINES=	clang=1
199
CLANG_CFLAGS=		-Wno-unknown-warning-option
200
CLANG_EXTRA_PATCHES=	${FILESDIR}/extra-patch-clang
201
CLANG_CONFIGURE_ENV=	AR=/usr/bin/ar
200
202
201
.if ${CHOSEN_COMPILER_TYPE} == gcc
203
GCC_GYP_DEFINES=	gcc_version=${CXX:S/g++//}
202
GYP_DEFINES+=	gcc_version=${CXX:S/g++//}
204
GCC_EXTRA_PATCHES=	${FILESDIR}/extra-patch-gcc
203
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-gcc
205
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
206
212
.if ! ${PORT_OPTIONS:MKERBEROS}
207
KERBEROS_GYP_DEFINES_OFF=	use_kerberos=0
213
GYP_DEFINES+=	use_kerberos=0
214
.endif
215
208
216
# according to portlint the below is passed via bsd.port.mk,
209
# according to portlint the below is passed via bsd.port.mk,
217
# but 'make -V CONFIGURE_ENV' does not show it:
210
# but 'make -V CONFIGURE_ENV' does not show it:
Lines 223-233 CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ Link Here
223
pre-everything::
216
pre-everything::
224
	@${ECHO_MSG}
217
	@${ECHO_MSG}
225
	@${ECHO_MSG} "To build Chromium, you should have around 2 GB of memory"
218
	@${ECHO_MSG} "To build Chromium, you should have around 2 GB of memory"
226
.if ${PORT_OPTIONS:MDEBUG}
219
	@${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}
220
	@${ECHO_MSG}
232
	@${ECHO_MSG} "Make sure you have Python build with the SEM option ON"
221
	@${ECHO_MSG} "Make sure you have Python build with the SEM option ON"
233
	@${ECHO_MSG} "(default in python27-2.7.8 since r361735)"
222
	@${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 .
340
		./build/gyp_chromium chrome/chrome.gyp --depth .
352
341
353
test regression-test: build
342
test regression-test: build
354
.for t in ${TEST_TARGETS}
343
.for t in ${RUN_TESTS}
355
	cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \
344
	cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \
356
		./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE}
345
		./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE}
357
.endfor
346
.endfor
Lines 380-388 do-install: Link Here
380
	${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin
369
	${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin
381
	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/mksnapshot \
370
	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/mksnapshot \
382
		${STAGEDIR}${DATADIR}
371
		${STAGEDIR}${DATADIR}
383
.if ${PORT_OPTIONS:MDRIVER}
372
373
post-install-DRIVER-on:
384
	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \
374
	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \
385
		${STAGEDIR}${PREFIX}/bin
375
		${STAGEDIR}${PREFIX}/bin
386
.endif
387
376
388
.include <bsd.port.post.mk>
377
.include <bsd.port.mk>

Return to bug 202609