| 1 |
commit: cafd6ad57a34ab75bcd488be996019dc6c3f8268 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 29 22:26:22 2017 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 29 22:27:09 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cafd6ad5 |
| 7 |
|
| 8 |
www-client/chromium: fix warnings about _FORTIFY_SOURCE being redefined |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3_p42_p324477, Repoman-2.3.1_p35_p324477 |
| 11 |
|
| 12 |
www-client/chromium/chromium-57.0.2987.8.ebuild | 1 + |
| 13 |
.../chromium/files/chromium-FORTIFY_SOURCE.patch | 27 ++++++++++++++++++++++ |
| 14 |
2 files changed, 28 insertions(+) |
| 15 |
|
| 16 |
diff --git a/www-client/chromium/chromium-57.0.2987.8.ebuild b/www-client/chromium/chromium-57.0.2987.8.ebuild |
| 17 |
index 139ec0c..8613930 100644 |
| 18 |
--- a/www-client/chromium/chromium-57.0.2987.8.ebuild |
| 19 |
+++ b/www-client/chromium/chromium-57.0.2987.8.ebuild |
| 20 |
@@ -158,6 +158,7 @@ For other desktop environments, try one of the following: |
| 21 |
PATCHES=( |
| 22 |
"${FILESDIR}/${PN}-system-ffmpeg-r4.patch" |
| 23 |
"${FILESDIR}/${PN}-widevine-r1.patch" |
| 24 |
+ "${FILESDIR}/${PN}-FORTIFY_SOURCE.patch" |
| 25 |
) |
| 26 |
|
| 27 |
pre_build_checks() { |
| 28 |
|
| 29 |
diff --git a/www-client/chromium/files/chromium-FORTIFY_SOURCE.patch b/www-client/chromium/files/chromium-FORTIFY_SOURCE.patch |
| 30 |
new file mode 100644 |
| 31 |
index 00000000..c6477d6 |
| 32 |
--- /dev/null |
| 33 |
+++ b/www-client/chromium/files/chromium-FORTIFY_SOURCE.patch |
| 34 |
@@ -0,0 +1,27 @@ |
| 35 |
+Drop _FORTIFY_SOURCE=2 from defines |
| 36 |
+ |
| 37 |
+Gentoo toolchains enable this by default. Removing this prevents spammy |
| 38 |
+warnings about the macro being redefined. |
| 39 |
+ |
| 40 |
+--- a/build/config/compiler/BUILD.gn |
| 41 |
++++ b/build/config/compiler/BUILD.gn |
| 42 |
+@@ -1069,19 +1069,6 @@ config("chromium_code") { |
| 43 |
+ "__STDC_FORMAT_MACROS", |
| 44 |
+ ] |
| 45 |
+ |
| 46 |
+- if (!is_debug && !using_sanitizer && |
| 47 |
+- (!is_linux || !is_clang || is_official_build)) { |
| 48 |
+- # _FORTIFY_SOURCE isn't really supported by Clang now, see |
| 49 |
+- # http://llvm.org/bugs/show_bug.cgi?id=16821. |
| 50 |
+- # It seems to work fine with Ubuntu 12 headers though, so use it in |
| 51 |
+- # official builds. |
| 52 |
+- # |
| 53 |
+- # Non-chromium code is not guaranteed to compile cleanly with |
| 54 |
+- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are |
| 55 |
+- # disabled, so only do that for Release build. |
| 56 |
+- defines += [ "_FORTIFY_SOURCE=2" ] |
| 57 |
+- } |
| 58 |
+- |
| 59 |
+ if (is_mac || is_ios) { |
| 60 |
+ cflags_objc = [ "-Wobjc-missing-property-synthesis" ] |
| 61 |
+ cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] |
Archives