commit: cafd6ad57a34ab75bcd488be996019dc6c3f8268
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 22:26:22 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 22:27:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cafd6ad5
www-client/chromium: fix warnings about _FORTIFY_SOURCE being redefined
Package-Manager: Portage-2.3.3_p42_p324477, Repoman-2.3.1_p35_p324477
www-client/chromium/chromium-57.0.2987.8.ebuild | 1 +
.../chromium/files/chromium-FORTIFY_SOURCE.patch | 27 ++++++++++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/www-client/chromium/chromium-57.0.2987.8.ebuild
b/www-client/chromium/chromium-57.0.2987.8.ebuild
index 139ec0c..8613930 100644
--- a/www-client/chromium/chromium-57.0.2987.8.ebuild
+++ b/www-client/chromium/chromium-57.0.2987.8.ebuild
@@ -158,6 +158,7 @@ For other desktop environments, try one of the following:
PATCHES=(
"${FILESDIR}/${PN}-system-ffmpeg-r4.patch"
"${FILESDIR}/${PN}-widevine-r1.patch"
+ "${FILESDIR}/${PN}-FORTIFY_SOURCE.patch"
)
pre_build_checks() {
diff --git a/www-client/chromium/files/chromium-FORTIFY_SOURCE.patch
b/www-client/chromium/files/chromium-FORTIFY_SOURCE.patch
new file mode 100644
index 00000000..c6477d6
--- /dev/null
+++ b/www-client/chromium/files/chromium-FORTIFY_SOURCE.patch
@@ -0,0 +1,27 @@
+Drop _FORTIFY_SOURCE=2 from defines
+
+Gentoo toolchains enable this by default. Removing this prevents spammy
+warnings about the macro being redefined.
+
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -1069,19 +1069,6 @@ config("chromium_code") {
+ "__STDC_FORMAT_MACROS",
+ ]
+
+- if (!is_debug && !using_sanitizer &&
+- (!is_linux || !is_clang || is_official_build)) {
+- # _FORTIFY_SOURCE isn't really supported by Clang now, see
+- # http://llvm.org/bugs/show_bug.cgi?id=16821.
+- # It seems to work fine with Ubuntu 12 headers though, so use it in
+- # official builds.
+- #
+- # Non-chromium code is not guaranteed to compile cleanly with
+- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
+- # disabled, so only do that for Release build.
+- defines += [ "_FORTIFY_SOURCE=2" ]
+- }
+-
+ if (is_mac || is_ios) {
+ cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
+ cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
