diff options
| author | rene <rene@FreeBSD.org> | 2014-11-07 18:51:33 +0800 |
|---|---|---|
| committer | rene <rene@FreeBSD.org> | 2014-11-07 18:51:33 +0800 |
| commit | de65e24c3c121798e2cfc4c07a07641462271b16 (patch) | |
| tree | b6ef5a2f9c0c11c766040e6f2a3b2ee555b0791e | |
| parent | 47057f58a4c332c5fdcb6f3bbb41d69af8721abb (diff) | |
| download | freebsd-ports-gnome-de65e24c3c121798e2cfc4c07a07641462271b16.tar.gz freebsd-ports-gnome-de65e24c3c121798e2cfc4c07a07641462271b16.tar.zst freebsd-ports-gnome-de65e24c3c121798e2cfc4c07a07641462271b16.zip | |
www/chromium:
- fix crash on startup on systems which do not have libexecinfo in base
(typically 8.X and 9.X)
- conditionally bump PORTREVISION
PR: ports/193610
Submitted by: Rob Belics
Patch by: Tomek
MFH: 2014Q4
| -rw-r--r-- | www/chromium/Makefile | 7 | ||||
| -rw-r--r-- | www/chromium/files/extra-patch-fixup-ffmpeg | 18 |
2 files changed, 25 insertions, 0 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 7afdd58a1d33..81bd9128424a 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -165,6 +165,13 @@ GYP_DEFINES+= disable_sse2=1 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libusb-pc .endif +# pointed out by "Tomek" on freebsd-chromium@ +.if !exists(/usr/lib/libexecinfo.so) +CFLAGS+= -fno-omit-frame-pointer +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-fixup-ffmpeg +PORTREVISION= 1 +.endif + .if ${PORT_OPTIONS:MTEST} .include "Makefile.tests" ALL_TARGET+= ${TEST_TARGETS} diff --git a/www/chromium/files/extra-patch-fixup-ffmpeg b/www/chromium/files/extra-patch-fixup-ffmpeg new file mode 100644 index 000000000000..a9d61b97b76b --- /dev/null +++ b/www/chromium/files/extra-patch-fixup-ffmpeg @@ -0,0 +1,18 @@ +--- third_party/ffmpeg/ffmpeg.gyp.orig 2014-10-27 20:27:40.000000000 +0100 ++++ third_party/ffmpeg/ffmpeg.gyp 2014-11-06 22:53:10.000000000 +0100 +@@ -213,6 +213,15 @@ + 'cflags!': [ + '-fno-omit-frame-pointer', + ], ++ # "Tomek" from freebsd-chromium@ figured this out, rene is ++ # puzzled why this is needed. Fixes runtime on FreeBSD < 10 ++ 'cflags_c': [ ++ '-fomit-frame-pointer', ++ ], ++ 'cflags_cc': [ ++ '-fomit-frame-pointer', ++ ], ++ # back to upstream code + 'debug_extra_cflags!': [ + '-fno-omit-frame-pointer', + ], |