commit: 102f79613e208193ade66e71ddf6530db3fadc05 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Feb 5 23:15:36 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Feb 5 23:16:32 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=102f7961
dev-build/ninja: fix LFS (by respecting CPPFLAGS) Reported by dilfridge w/ x86 build on XFS (which has larger inodes). See also 280be1cadfdfd607d422dcefa33e9f15bf9c638c. Bug: https://bugs.gentoo.org/760848 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-build/ninja/files/ninja-cppflags.patch | 21 +++++++++++++++++++++ .../{ninja-9999.ebuild => ninja-1.11.1-r5.ebuild} | 1 + dev-build/ninja/ninja-9999.ebuild | 1 + 3 files changed, 23 insertions(+) diff --git a/dev-build/ninja/files/ninja-cppflags.patch b/dev-build/ninja/files/ninja-cppflags.patch new file mode 100644 index 000000000000..375f6fce6045 --- /dev/null +++ b/dev-build/ninja/files/ninja-cppflags.patch @@ -0,0 +1,21 @@ +Needed for append-lfs-flags to work. +--- a/configure.py ++++ b/configure.py +@@ -261,7 +261,7 @@ configure_args = sys.argv[1:] + if '--bootstrap' in configure_args: + configure_args.remove('--bootstrap') + n.variable('configure_args', ' '.join(configure_args)) +-env_keys = set(['CXX', 'AR', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS']) ++env_keys = set(['CXX', 'AR', 'CFLAGS', 'CPPFLAGS', 'CXXFLAGS', 'LDFLAGS']) + configure_env = dict((k, os.environ[k]) for k in os.environ if k in env_keys) + if configure_env: + config_str = ' '.join([k + '=' + pipes.quote(configure_env[k]) +@@ -406,6 +406,8 @@ def shell_escape(str): + if 'CFLAGS' in configure_env: + cflags.append(configure_env['CFLAGS']) + ldflags.append(configure_env['CFLAGS']) ++if 'CPPFLAGS' in configure_env: ++ cflags.append(configure_env['CPPFLAGS']) + if 'CXXFLAGS' in configure_env: + cflags.append(configure_env['CXXFLAGS']) + ldflags.append(configure_env['CXXFLAGS']) diff --git a/dev-build/ninja/ninja-9999.ebuild b/dev-build/ninja/ninja-1.11.1-r5.ebuild similarity index 98% copy from dev-build/ninja/ninja-9999.ebuild copy to dev-build/ninja/ninja-1.11.1-r5.ebuild index 4a9cf1f32132..eae54565f9fc 100644 --- a/dev-build/ninja/ninja-9999.ebuild +++ b/dev-build/ninja/ninja-1.11.1-r5.ebuild @@ -40,6 +40,7 @@ PDEPEND=" PATCHES=( "${FILESDIR}"/ninja-cflags.patch + "${FILESDIR}"/ninja-cppflags.patch ) run_for_build() { diff --git a/dev-build/ninja/ninja-9999.ebuild b/dev-build/ninja/ninja-9999.ebuild index 4a9cf1f32132..eae54565f9fc 100644 --- a/dev-build/ninja/ninja-9999.ebuild +++ b/dev-build/ninja/ninja-9999.ebuild @@ -40,6 +40,7 @@ PDEPEND=" PATCHES=( "${FILESDIR}"/ninja-cflags.patch + "${FILESDIR}"/ninja-cppflags.patch ) run_for_build() {
