Date: Tue, 4 Mar 2014 18:27:45 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347055 - in head/www/chromium: . files Message-ID: <201403041827.s24IRjHw042315@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Tue Mar 4 18:27:45 2014 New Revision: 347055 URL: http://svnweb.freebsd.org/changeset/ports/347055 QAT: https://qat.redports.org/buildarchive/r347055/ Log: Fix build on 8.4 (which uses GCC now because of c++11-lib) Instead of removing the -Wno-unknown-warning-option, split this out in a Clang specific version and a GCC specific version (yay). Submitted by: George Mitchell via freebsd-ports Modified: head/www/chromium/Makefile head/www/chromium/files/extra-patch-gcc Modified: head/www/chromium/Makefile ============================================================================== --- head/www/chromium/Makefile Tue Mar 4 18:26:22 2014 (r347054) +++ head/www/chromium/Makefile Tue Mar 4 18:27:45 2014 (r347055) @@ -22,7 +22,7 @@ LICENSE= BSD3CLAUSE LGPL21 MPL LICENSE_COMB= multi WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} -CFLAGS+= -fno-stack-protector -Wno-unknown-warning-option +CFLAGS+= -fno-stack-protector BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ bash:${PORTSDIR}/shells/bash \ @@ -150,12 +150,6 @@ CONFIGURE_ENV+= CC=${CC} \ CXX=${CXX} \ GYP_GENERATORS=ninja \ GYP_DEFINES="${GYP_DEFINES}" -# according to portlint the below is passed via bsd.port.mk, -# but 'make -V CONFIGURE_ENV' does not show it: -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ - CPPFLAGS="${CPPFLAGS}" \ - CXXFLAGS="${CXXFLAGS}" \ - LDFLAGS="${LDFLAGS}" MAKE_ENV+= BUILDTYPE=${BUILDTYPE} \ GPERF=${LOCALBASE}/bin/gperf MAKE_ARGS+= -C out/${BUILDTYPE} @@ -164,13 +158,22 @@ MAKE_ARGS+= -C out/${BUILDTYPE} .if ${CHOSEN_COMPILER_TYPE} == gcc GYP_DEFINES+= gcc_version=${CXX:S/g++//} +CFLAGS+= -Wno-unknown-warning EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gcc .else GYP_DEFINES+= clang=1 +CFLAGS+= -Wno-unknown-warning-option EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang CONFIGURE_ENV+= AR=/usr/bin/ar .endif +# according to portlint the below is passed via bsd.port.mk, +# but 'make -V CONFIGURE_ENV' does not show it: +CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ + CPPFLAGS="${CPPFLAGS}" \ + CXXFLAGS="${CXXFLAGS}" \ + LDFLAGS="${LDFLAGS}" + pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "To build Chromium, you should have around 1 GB of memory" Modified: head/www/chromium/files/extra-patch-gcc ============================================================================== --- head/www/chromium/files/extra-patch-gcc Tue Mar 4 18:26:22 2014 (r347054) +++ head/www/chromium/files/extra-patch-gcc Tue Mar 4 18:27:45 2014 (r347055) @@ -50,3 +50,15 @@ #if HAVE_SCHED_GETAFFINITY #ifndef _GNU_SOURCE # define _GNU_SOURCE +--- content/browser/browser_shutdown_profile_dumper.cc.orig 2014-02-20 15:28:24.000000000 -0500 ++++ content/browser/browser_shutdown_profile_dumper.cc 2014-03-03 15:36:33.000000000 -0500 +@@ -2,6 +2,8 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + ++#include <stdio.h> ++ + #include "content/browser/browser_shutdown_profile_dumper.h" + + #include "base/base_switches.h" +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403041827.s24IRjHw042315>