diff --git a/gn/Makefile b/gn/Makefile index d91c961f8b3..a7686a495ee 100644 --- a/gn/Makefile +++ b/gn/Makefile @@ -9,9 +9,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://gn.googlesource.com/gn.git -PKG_SOURCE_DATE:=2026-06-12 -PKG_SOURCE_VERSION:=28df2d93df29e5f773dd51ed2f19c112987626ed -PKG_MIRROR_HASH:=17cd2a6c5db5b756d276be35d88b1a7e751c9aa2880526021e9a27a5cf324bef +PKG_SOURCE_DATE:=2026-07-03 +PKG_SOURCE_VERSION:=5e880747b8b66554f1c1f300400f78af296a6151 +PKG_MIRROR_HASH:=29dc4e553aba2888a08248c74e9af4a84ccf93aeb2054743f37c97758b43d49c PKG_LICENSE:=BSD 3-Clause PKG_LICENSE_FILES:=LICENSE diff --git a/gn/patches/010-gn-fix-old-libstdcxx-ranges-unique.patch b/gn/patches/010-gn-fix-old-libstdcxx-ranges-unique.patch index 9345fdbee73..2a9848699bd 100644 --- a/gn/patches/010-gn-fix-old-libstdcxx-ranges-unique.patch +++ b/gn/patches/010-gn-fix-old-libstdcxx-ranges-unique.patch @@ -1,6 +1,6 @@ --- a/src/gn/rust_project_writer.cc +++ b/src/gn/rust_project_writer.cc -@@ -218,8 +218,13 @@ RustProjectWriter::Crate RustProjectWrit +@@ -236,8 +236,13 @@ void AddTarget(const BuildSettings* buil std::ranges::sort(include_dirs, [](const auto& lhs, const auto& rhs) { return lhs.value() < rhs.value(); }); @@ -14,10 +14,9 @@ Crate crate = Crate(crate_root, include_dirs, crate_id, crate_label, edition.value_or("2015")); - --- a/src/gn/ninja_binary_target_writer.cc +++ b/src/gn/ninja_binary_target_writer.cc -@@ -152,8 +152,13 @@ +@@ -152,8 +152,13 @@ void NinjaBinaryTargetWriter::WritePriva std::ranges::sort(deps, [](const Target* lhs, const Target* rhs) { return lhs->module_name() < rhs->module_name(); }); diff --git a/gn/patches/020-clang-host-compat.patch b/gn/patches/020-clang-host-compat.patch index ebe49d6e0f9..012b0cb18a2 100644 --- a/gn/patches/020-clang-host-compat.patch +++ b/gn/patches/020-clang-host-compat.patch @@ -1,7 +1,7 @@ --- a/build/gen.py +++ b/build/gen.py -@@ -212,6 +212,23 @@ def is_gcc(cxx): - capture_output=True) +@@ -245,6 +245,23 @@ def is_gcc(cxx): + return ret.returncode == 0 and "#define __GNUC__" in ret.stdout and not "#define __clang__" in ret.stdout + @@ -24,7 +24,7 @@ def GenerateLastCommitPosition(host, header): ROOT_TAG = 'initial-commit' if os.path.isdir(os.path.join(REPO_ROOT, '.git')): -@@ -391,6 +408,12 @@ def WriteGNNinja(path, platform, host, options, args_list): +@@ -456,6 +473,12 @@ def WriteGNNinja(path, platform, host, o libs = [] if not platform.is_msvc(): @@ -37,7 +37,7 @@ if options.debug: cflags.extend(['-O0', '-g']) # Enable libc++ or libstdc++ assertions in debug mode. -@@ -506,9 +529,13 @@ def WriteGNNinja(path, platform, host, options, args_list): +@@ -528,9 +551,13 @@ def WriteGNNinja(path, platform, host, o '-Wextra-semi', '-Wundef', @@ -54,7 +54,7 @@ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104336 --- a/src/gn/command_suggest.cc +++ b/src/gn/command_suggest.cc -@@ -444,7 +444,14 @@ +@@ -444,7 +444,14 @@ bool OutputSuggestions(const std::vector } return false; } diff --git a/gn/src/out/last_commit_position.h b/gn/src/out/last_commit_position.h index 5818a893df3..4836d08bf5d 100644 --- a/gn/src/out/last_commit_position.h +++ b/gn/src/out/last_commit_position.h @@ -3,7 +3,7 @@ #ifndef OUT_LAST_COMMIT_POSITION_H_ #define OUT_LAST_COMMIT_POSITION_H_ -#define LAST_COMMIT_POSITION_NUM 2414 -#define LAST_COMMIT_POSITION "2414 (28df2d93df29)" +#define LAST_COMMIT_POSITION_NUM 2450 +#define LAST_COMMIT_POSITION "2450 (5e880747b8b6)" #endif // OUT_LAST_COMMIT_POSITION_H_