mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-03 01:23:49 +00:00
Code Issues Releases Activity

Fix build on 8.4 (which uses GCC now because of c++11-lib)

Browse Source 
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
This commit is contained in:
Rene Ladan 2014-03-04 18:27:45 +00:00
parent 284cd479c9
commit 6524f66fba
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=347055
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
www/chromium/Makefile
View File

@ -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"

12
www/chromium/files/extra-patch-gcc
View File

@ -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"