diff --git a/.gitignore b/.gitignore index ffc6574..d39006f 100644 --- a/.gitignore +++ b/.gitignore @@ -96,3 +96,4 @@ /gn-a3dcd7a7ad86.tar.gz /gn-8b973aa51d02.tar.gz /gn-0a2b8eac80f1.tar.gz +/gn-03d10f1657b4.tar.gz diff --git a/gn-0153d369-no-O3.patch b/gn-0153d369-no-O3.patch deleted file mode 100644 index 13a4820..0000000 --- a/gn-0153d369-no-O3.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur gn-0153d369bbccc908f4da4993b1ba82728055926a-original/build/gen.py gn-0153d369bbccc908f4da4993b1ba82728055926a/build/gen.py ---- gn-0153d369bbccc908f4da4993b1ba82728055926a-original/build/gen.py 2021-09-27 14:58:14.000000000 -0400 -+++ gn-0153d369bbccc908f4da4993b1ba82728055926a/build/gen.py 2021-09-27 15:59:42.330405195 -0400 -@@ -344,10 +344,8 @@ - cflags.extend(['-O0', '-g']) - else: - cflags.append('-DNDEBUG') -- 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. diff --git a/gn-03d10f1657b4-no-O3.patch b/gn-03d10f1657b4-no-O3.patch new file mode 100644 index 0000000..d67f85a --- /dev/null +++ b/gn-03d10f1657b4-no-O3.patch @@ -0,0 +1,14 @@ +diff -Naur gn-03d10f1657b4-original/build/gen.py gn-03d10f1657b4/build/gen.py +--- gn-03d10f1657b4-original/build/gen.py 2024-02-22 16:27:50.129000000 -0500 ++++ gn-03d10f1657b4/build/gen.py 2024-02-22 16:30:14.595100970 -0500 +@@ -416,10 +416,8 @@ + 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') + # 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. diff --git a/gn.spec b/gn.spec index 4be79c4..d924557 100644 --- a/gn.spec +++ b/gn.spec @@ -24,10 +24,10 @@ Name: gn # 7. Commit the changes # # See https://gn.googlesource.com/gn/+log for the latest changes. -%global commit 0a2b8eac80f164f10b2cbc126890db0d295790cd -%global access 20240216 +%global commit 03d10f1657b4ddace618c34ab61b6357d1ae9c9a +%global access 20240222 %global shortcommit %(c='%{commit}'; echo "${c:0:12}") -%global position 2146 +%global position 2149 Version: %{position}^%{access}git%{shortcommit} Release: %autorelease Summary: Meta-build system that generates build files for Ninja @@ -50,7 +50,7 @@ Source2: update-version # Stop overriding optimization flags; not sent upstream because this is # intentional on their part -Patch: gn-0153d369-no-O3.patch +Patch: gn-03d10f1657b4-no-O3.patch # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} diff --git a/last_commit_position.h b/last_commit_position.h index c39000a..793bcab 100644 --- a/last_commit_position.h +++ b/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 2146 -#define LAST_COMMIT_POSITION "2146 (0a2b8eac80f1)" +#define LAST_COMMIT_POSITION_NUM 2149 +#define LAST_COMMIT_POSITION "2149 (03d10f1657b4)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/sources b/sources index 900aba6..95eb2e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gn-0a2b8eac80f1.tar.gz) = 815abb1a8cf82f38083e3c7e494aa34fb7a47b67c9b3586f91148ff8ee757d393c7923b00ea21e20e22bbaad541580e9b27e4de2c026d9067598c7a4ee1400a2 +SHA512 (gn-03d10f1657b4.tar.gz) = 5dfa28207bd29e909a6bceef35cacd6ab9d12f6f44141398514fb6e060db71bee1e4188805a9cbe572473f10899ecd6328b2d45b4c9b85d70f440624fa34dabf