commit: a390d9d78b6208b24420aaaee21c804a833c5684
Author: Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 10 02:55:59 2024 +0000
Commit: Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Fri Oct 11 13:19:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a390d9d7
dev-build/gn: add 0.2200-r1; update Live
The -r1 ebuild has an updated patch that does not
remove `-DNDEBUG` from CFLAGS in the non-debug build
path.
This has not caused issues before however current Chromium
builds that are otherwise fine fail asserts resulting in
messages like:
`FATAL:command_gen.cc(###)] Check failed: !rule.empty().`
It is expected that this will eventually be resolved by
changes to GN or Chromium. For now, Chromium builds
and upstream don't seem to be running into any
issues with using very similar commits as part of
their current DEPS file.
Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>
dev-build/gn/files/gn-gen-r7.patch | 39 ++++++++++++++++++++++
.../gn/{gn-9999.ebuild => gn-0.2200-r1.ebuild} | 2 +-
dev-build/gn/gn-9999.ebuild | 2 +-
3 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/dev-build/gn/files/gn-gen-r7.patch
b/dev-build/gn/files/gn-gen-r7.patch
new file mode 100644
index 000000000000..f49236021406
--- /dev/null
+++ b/dev-build/gn/files/gn-gen-r7.patch
@@ -0,0 +1,39 @@
+From 74f21d84b06e63cd558a5e69f8195b5f93230a2f Mon Sep 17 00:00:00 2001
+From: Matt Jolly <kan...@gentoo.org>
+Date: Thu, 10 Oct 2024 12:23:12 +1000
+Subject: [PATCH] Update patch to v7
+
+---
+ build/gen.py | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/build/gen.py b/build/gen.py
+index d1c649cb..104ce569 100755
+--- a/build/gen.py
++++ b/build/gen.py
+@@ -432,10 +432,10 @@ def WriteGNNinja(path, platform, host, options,
args_list):
+ cflags.extend(['-D_LIBCPP_DEBUG=1', '-D_GLIBCXX_DEBUG=1'])
+ else:
+ cflags.append('-DNDEBUG')
+- cflags.append('-O3')
+- if options.no_strip:
+- cflags.append('-g')
+- ldflags.append('-O3')
++# cflags.append('-O3')
++# if options.no_strip:
++# cflags.append('-g')
++# ldflags.append('-O3')
+ # Use -fdata-sections and -ffunction-sections to place each function
+ # or data item into its own section so --gc-sections can eliminate any
+ # unused functions and data items.
+@@ -482,7 +482,6 @@ def WriteGNNinja(path, platform, host, options, args_list):
+ '-D_FILE_OFFSET_BITS=64',
+ '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS',
+ '-pthread',
+- '-pipe',
+ '-fno-exceptions',
+ '-fno-rtti',
+ '-fdiagnostics-color',
+--
+2.46.2
+
diff --git a/dev-build/gn/gn-9999.ebuild b/dev-build/gn/gn-0.2200-r1.ebuild
similarity index 97%
copy from dev-build/gn/gn-9999.ebuild
copy to dev-build/gn/gn-0.2200-r1.ebuild
index a252da4d6f3f..dfc6073b0e1a 100644
--- a/dev-build/gn/gn-9999.ebuild
+++ b/dev-build/gn/gn-0.2200-r1.ebuild
@@ -26,7 +26,7 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}"/gn-gen-r6.patch
+ "${FILESDIR}"/gn-gen-r7.patch
)
pkg_setup() {
diff --git a/dev-build/gn/gn-9999.ebuild b/dev-build/gn/gn-9999.ebuild
index a252da4d6f3f..dfc6073b0e1a 100644
--- a/dev-build/gn/gn-9999.ebuild
+++ b/dev-build/gn/gn-9999.ebuild
@@ -26,7 +26,7 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}"/gn-gen-r6.patch
+ "${FILESDIR}"/gn-gen-r7.patch
)
pkg_setup() {
