Attachment 160304 Details for Bug 202609 – v1 against review D3410 (unsorted)

[patch] v1 against review D3410 (unsorted)

option_helpers.diff (text/plain), 4.80 KB, created by Jan Beich on 2015-08-24 11:26:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2015-08-24 11:26:18 UTC

Size: 4.80 KB

patch

obsolete

>Index: www/chromium/Makefile
>===================================================================
>--- www/chromium/Makefile	(revision 395156)
>+++ www/chromium/Makefile	(working copy)
>@@ -130,8 +130,18 @@ SUB_FILES=	chromium-browser.desktop chrome
> SUB_LIST+=	COMMENT="${COMMENT}"
> 
> OPTIONS_DEFINE=	CODECS GCONF PULSEAUDIO TEST KERBEROS DEBUG DRIVER
>+OPTIONS_DEFINE_amd64=	SSE2
>+OPTIONS_DEFINE_i386=	SSE2
>+OPTIONS_DEFAULT_amd64=	SSE2
>+OPTIONS_DEFAULT_i386=	${MACHINE_CPU:tu:MSSE2}
>+
>+# Make compiler-type into an option helper
>+.include <bsd.compiler.mk> # XXX already on 11.0-CURRENT or base r265420
>+OPTIONS_SLAVE+=	${COMPILER_TYPE:tu}
>+
> CODECS_DESC=	Compile and enable patented codecs like H.264
> DRIVER_DESC=	Install chromedriver
>+SSE2_DESC=	${SSE_DESC:S/SSE/SSE2/}
> 
> OPTIONS_DEFAULT=	CODECS GCONF KERBEROS
> OPTIONS_SUB=	yes
>@@ -141,32 +151,19 @@ PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/au
> DRIVER_MAKE_ARGS=chromedriver
> TEST_DISTFILES=	${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}
> 
>-.include <bsd.port.options.mk>
>+CODECS_VARS=	GYP_DEFINES=ffmpeg_branding=Chrome \
>+		GYP_DEFINES=proprietary_codecs=1
>+CODECS_VARS_OFF=GYP_DEFINES=ffmpeg_branding=Chromium \
>+		GYP_DEFINES=proprietary_codecs=0
> 
>-.if ${PORT_OPTIONS:MCODECS}
>-GYP_DEFINES+=	ffmpeg_branding=Chrome
>-GYP_DEFINES+=	proprietary_codecs=1
>-.else
>-GYP_DEFINES+=	ffmpeg_branding=Chromium
>-GYP_DEFINES+=	proprietary_codecs=0
>-.endif
>+GCONF_VARS=	GYP_DEFINES=use_gconf=1
>+GCONF_VARS_OFF=	GYP_DEFINES=use_gconf=0
> 
>-.if ${PORT_OPTIONS:MGCONF}
>-GYP_DEFINES+=	use_gconf=1
>-.else
>-GYP_DEFINES+=	use_gconf=0
>-.endif
>+PULSEAUDIO_VARS=	GYP_DEFINES=use_pulseaudio=1
>+PULSEAUDIO_VARS_OFF=	GYP_DEFINES=use_pulseaudio=0
> 
>-.if ${PORT_OPTIONS:MPULSEAUDIO}
>-GYP_DEFINES+=	use_pulseaudio=1
>-.else
>-GYP_DEFINES+=	use_pulseaudio=0
>-.endif
>+SSE2_VARS_OFF=	GYP_DEFINES=disable_sse2=1
> 
>-.if ! ${MACHINE_CPU:Msse2}
>-GYP_DEFINES+=	disable_sse2=1
>-.endif
>-
> .if !exists(/usr/libdata/pkgconfig/libusb-1.0.pc)
> EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libusb-pc
> .endif
>@@ -177,17 +174,15 @@ CFLAGS+=	-fno-omit-frame-pointer
> EXTRA_PATCHES+=	${FILESDIR}/extra-patch-fixup-ffmpeg
> .endif
> 
>-.if ${PORT_OPTIONS:MTEST}
> .include "Makefile.tests"
>-ALL_TARGET+=	${TEST_TARGETS}
>-.endif
>+TEST_ALL_TARGET=${TEST_TARGETS}
>+TEST_VARS=	${TEST_TARGETS:S,^,RUN_TESTS=,}
> 
> DEBUG_MAKE_ENV=	V=1
>-.if ${PORT_OPTIONS:MDEBUG}
>-BUILDTYPE=	Debug
>-.else
>-BUILDTYPE=	Release
>-.endif
>+DEBUG_VARS=	BUILDTYPE=Debug \
>+		WANTSPACE="lots of free diskspace (~ 8.5GB)"
>+DEBUG_VARS_OFF=	BUILDTYPE=Release \
>+		WANTSPACE="a fair amount of free diskspace (~ 3.7GB)"
> 
> CONFIGURE_ENV+=	CC="${CC}" \
> 		CXX="${CXX}" \
>@@ -196,22 +191,16 @@ CONFIGURE_ENV+=	CC="${CC}" \
> MAKE_ENV+=	BUILDTYPE=${BUILDTYPE} \
> 		GPERF="${LOCALBASE}/bin/gperf"
> 
>-.include <bsd.port.pre.mk>
>+CLANG_VARS=	GYP_DEFINES=clang=1
>+CLANG_CFLAGS=	-Wno-unknown-warning-option
>+CLANG_EXTRA_PATCHES=	${FILESDIR}/extra-patch-clang
>+CLANG_CONFIGURE_ENV=	AR=/usr/bin/ar
> 
>-.if ${CHOSEN_COMPILER_TYPE} == gcc
>-GYP_DEFINES+=	gcc_version=${CXX:S/g++//}
>-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-gcc
>-CFLAGS+=	-fno-stack-protector # gcc 4.8 cannot find __stack_chk_fail_local
>-.else
>-GYP_DEFINES+=	clang=1
>-CFLAGS+=	-Wno-unknown-warning-option
>-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clang
>-CONFIGURE_ENV+=	AR=/usr/bin/ar
>-.endif
>+GCC_VARS=	GYP_DEFINES=gcc_version=${CXX:S/g++//}
>+GCC_EXTRA_PATCHES=	${FILESDIR}/extra-patch-gcc
>+GCC_CFLAGS=	-fno-stack-protector # gcc 4.8 cannot find __stack_chk_fail_local
> 
>-.if ! ${PORT_OPTIONS:MKERBEROS}
>-GYP_DEFINES+=	use_kerberos=0
>-.endif
>+KERBEROS_VARS_OFF=	GYP_DEFINES=use_kerberos=0
> 
> # according to portlint the below is passed via bsd.port.mk,
> # but 'make -V CONFIGURE_ENV' does not show it:
>@@ -223,11 +212,7 @@ CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" \
> pre-everything::
> 	@${ECHO_MSG}
> 	@${ECHO_MSG} "To build Chromium, you should have around 2 GB of memory"
>-.if ${PORT_OPTIONS:MDEBUG}
>-	@${ECHO_MSG} "and lots of free diskspace (~ 8.5GB)."
>-.else
>-	@${ECHO_MSG} "and a fair amount of free diskspace (~ 3.7GB)."
>-.endif
>+	@${ECHO_MSG} "and ${WANTSPACE}."
> 	@${ECHO_MSG}
> 	@${ECHO_MSG} "Make sure you have Python build with the SEM option ON"
> 	@${ECHO_MSG} "(default in python27-2.7.8 since r361735)"
>@@ -351,7 +336,7 @@ do-configure:
> 		./build/gyp_chromium chrome/chrome.gyp --depth .
> 
> test regression-test: build
>-.for t in ${TEST_TARGETS}
>+.for t in ${RUN_TESTS}
> 	cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \
> 		./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE}
> .endfor
>@@ -380,9 +365,9 @@ do-install:
> 	${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin
> 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/mksnapshot \
> 		${STAGEDIR}${DATADIR}
>-.if ${PORT_OPTIONS:MDRIVER}
>+
>+post-install-DRIVER-on:
> 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \
> 		${STAGEDIR}${PREFIX}/bin
>-.endif
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>

Actions: View | Diff

Attachments on bug 202609: 160282 | 160283 | 160291 | 160292 | 160293 | 160294 | 160304 | 160306 | 160437 | 183881 | 183931 | 183953 | 183954