- Update to 18.0.1025.151

- switch to gcc46 as compiler, clang appears to be too troublesome in practice
- add a patch to avoid fix SIGFPE crashes from protoc during the build [1]
Submitted by:	theraven via #bsdports [1]
Security:	http://www.vuxml.org/freebsd/057130e6-7f61-11e1-8a43-00262d5ed8ee.html
Feature safe:	yes
This commit is contained in:
Rene Ladan 2012-04-05 22:06:38 +00:00
parent 451d29f129
commit 7e1991e935
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=294267
3 changed files with 21 additions and 6 deletions

View file

@ -7,7 +7,7 @@
PORTNAME= chromium
DISTVERSIONPREFIX= courgette-redacted-
DISTVERSION= 18.0.1025.142
DISTVERSION= 18.0.1025.151
CATEGORIES= www
MASTER_SITES= http://download.goodking.org/downloads/ \
ftp://rene-ladan.nl/pub/distfiles/ \
@ -78,8 +78,8 @@ GYP_DEFINES+= use_cups=1 \
OPTIONS= CODECS "Compile and enable patented codecs like H.264" on \
GCONF "Use GConf2 for preferences" on \
PULSEAUDIO "Enable Pulse Audio support" off \
CLANG "Build Chromium with Clang" on \
GCC46 "Build Chromium with GCC 4.6+" off \
CLANG "Build Chromium with Clang" off \
GCC46 "Build Chromium with GCC 4.6+" on \
DEBUG "Compile with debug symbols and verbose output" off
.include <bsd.port.options.mk>
@ -120,7 +120,7 @@ IGNORE= does not compile with base gcc
.endif
.if defined(WITH_GCC46) && defined(WITH_CLANG)
IGNORE= conflicting options (CLANG or GCC46)
IGNORE= conflicting options (CLANG and GCC46)
.endif
.if defined(WITH_GCC46)

View file

@ -1,2 +1,2 @@
SHA256 (chromium-courgette-redacted-18.0.1025.142.tar.xz) = 1185489497241a3563bfa89d0cbc6e49bca4c4ddbe2bdf8421bf66923edd5a77
SIZE (chromium-courgette-redacted-18.0.1025.142.tar.xz) = 142470108
SHA256 (chromium-courgette-redacted-18.0.1025.151.tar.xz) = 26821b7a63e00a450de5d3ad383e0b0a7355c43400395bf144f1aca2e9805169
SIZE (chromium-courgette-redacted-18.0.1025.151.tar.xz) = 142053280

View file

@ -0,0 +1,15 @@
--- third_party/protobuf/src/google/protobuf/compiler/main.cc.orig 2012-03-27 03:01:30.000000000 +0200
+++ third_party/protobuf/src/google/protobuf/compiler/main.cc 2012-04-01 12:39:04.000000000 +0200
@@ -35,9 +35,12 @@
#include <google/protobuf/compiler/python/python_generator.h>
#include <google/protobuf/compiler/java/java_generator.h>
+#include <fenv.h>
int main(int argc, char* argv[]) {
+ fedisableexcept(FE_INVALID);
+
google::protobuf::compiler::CommandLineInterface cli;
cli.AllowPlugins("protoc-");