From owner-svn-ports-all@FreeBSD.ORG Wed Nov 20 12:48:35 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8B453FB; Wed, 20 Nov 2013 12:48:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6CC9C283D; Wed, 20 Nov 2013 12:48:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAKCmZQh094261; Wed, 20 Nov 2013 12:48:35 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAKCmZP3094260; Wed, 20 Nov 2013 12:48:35 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201311201248.rAKCmZP3094260@svn.freebsd.org> From: Rene Ladan Date: Wed, 20 Nov 2013 12:48:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334412 - head/www/chromium X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Nov 2013 12:48:35 -0000 Author: rene Date: Wed Nov 20 12:48:34 2013 New Revision: 334412 URL: http://svnweb.freebsd.org/changeset/ports/334412 Log: Convert to USES=compiler:c++11-lang and remove the now-obsolete GCC option. This also means that on systems where /usr/bin/cc is clang 3.3 or higher, there is no option to compile this port with GCC (since it is new enough for C++11). On older systems FAVORITE_COMPILER=gcc can be set. While here use a few more option helpers. Modified: head/www/chromium/Makefile Modified: head/www/chromium/Makefile ============================================================================== --- head/www/chromium/Makefile Wed Nov 20 12:43:29 2013 (r334411) +++ head/www/chromium/Makefile Wed Nov 20 12:48:34 2013 (r334412) @@ -46,7 +46,8 @@ RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/l ONLY_FOR_ARCHS= i386 amd64 USE_XZ= yes -USES= bison desktop-file-utils pkgconfig perl5 shebangfix +USES= bison compiler:c++11-lang desktop-file-utils pkgconfig \ + perl5 shebangfix USE_PERL5= build USE_PYTHON_BUILD= 2.6-2.7 USE_XORG= scrnsaverproto x11 xproto xscrnsaver xtst @@ -91,10 +92,8 @@ SUB_FILES= chromium-browser.desktop SUB_LIST= COMMENT="${COMMENT}" \ DATADIR=${DATADIR} -OPTIONS_DEFINE= CODECS GCONF PULSEAUDIO GCC TEST DEBUG - +OPTIONS_DEFINE= CODECS GCONF PULSEAUDIO TEST DEBUG CODECS_DESC= Compile and enable patented codecs like H.264 -GCC_DESC= Build Chromium with GCC 4.6+ OPTIONS_DEFAULT= CODECS GCONF @@ -125,24 +124,6 @@ GYP_DEFINES+= use_pulseaudio=0 GYP_DEFINES+= disable_sse2=1 .endif -.if ${PORT_OPTIONS:MGCC} -USE_GCC?= yes -GYP_DEFINES+= gcc_version=${CXX:S/g++//} -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gcc -.else -.if ${OSVERSION} < 902000 -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang32:${PORTSDIR}/lang/clang32 -CC= ${LOCALBASE}/bin/clang32 -CXX= ${LOCALBASE}/bin/clang++32 -.else -CC= clang -CXX= clang++ -.endif -GYP_DEFINES+= clang=1 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang -CONFIGURE_ENV+= AR=/usr/bin/ar -.endif - .if ${OSVERSION} >= 1000052 && !exists(${LOCALBASE}/include/execinfo.h) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-fixup-execinfo .endif @@ -163,11 +144,11 @@ TEST_TARGETS= base_unittests \ content_unittests EXCLUDED_TESTS= GpuDriverBugListTest.CurrentDriverBugListValidation NINJA_TARGETS+= ${TEST_TARGETS} -DISTFILES+= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}:testdata .endif +TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}:testdata +DEBUG_MAKE_ENV= V=1 .if ${PORT_OPTIONS:MDEBUG} -MAKE_ENV+= V=1 BUILDTYPE= Debug GYP_DEFINES+= remove_webcore_debug_symbols=1 .else @@ -190,6 +171,15 @@ MAKE_ENV+= BUILDTYPE=${BUILDTYPE} \ .include +.if ${CHOSEN_COMPILER_TYPE} == gcc +GYP_DEFINES+= gcc_version=${CXX:S/g++//} +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gcc +.else +GYP_DEFINES+= clang=1 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang +CONFIGURE_ENV+= AR=/usr/bin/ar +.endif + pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "To build Chromium, you should have around 1 GB of memory"