* [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/files/, dev-build/ninja/
@ 2024-02-05 23:16 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2024-02-05 23:16 UTC (permalink / raw
To: gentoo-commits
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() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/files/, dev-build/ninja/
@ 2024-02-21 21:00 Mike Gilbert
0 siblings, 0 replies; 2+ messages in thread
From: Mike Gilbert @ 2024-02-21 21:00 UTC (permalink / raw
To: gentoo-commits
commit: 9549bcf6aceef0dcc7cbe779d30d7733dbe8f0f2
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 21 20:56:03 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Feb 21 20:59:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9549bcf6
dev-build/ninja: simplify LFS handling
Just append -D_FILE_OFFSET_BITS=64 to CXXFLAGS directly.
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-build/ninja/files/ninja-cppflags.patch | 21 ---------------------
dev-build/ninja/ninja-1.11.1-r5.ebuild | 7 +++----
dev-build/ninja/ninja-9999.ebuild | 7 +++----
3 files changed, 6 insertions(+), 29 deletions(-)
diff --git a/dev-build/ninja/files/ninja-cppflags.patch b/dev-build/ninja/files/ninja-cppflags.patch
deleted file mode 100644
index 375f6fce6045..000000000000
--- a/dev-build/ninja/files/ninja-cppflags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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-1.11.1-r5.ebuild b/dev-build/ninja/ninja-1.11.1-r5.ebuild
index ee03031346ed..44ee3c27b3bd 100644
--- a/dev-build/ninja/ninja-1.11.1-r5.ebuild
+++ b/dev-build/ninja/ninja-1.11.1-r5.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit edo bash-completion-r1 flag-o-matic python-any-r1 toolchain-funcs
+inherit edo bash-completion-r1 python-any-r1 toolchain-funcs
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
@@ -40,7 +40,6 @@ PDEPEND="
PATCHES=(
"${FILESDIR}"/ninja-cflags.patch
- "${FILESDIR}"/ninja-cppflags.patch
)
run_for_build() {
@@ -48,7 +47,7 @@ run_for_build() {
local -x AR=$(tc-getBUILD_AR)
local -x CXX=$(tc-getBUILD_CXX)
local -x CFLAGS=
- local -x CXXFLAGS=${BUILD_CXXFLAGS}
+ local -x CXXFLAGS="${BUILD_CXXFLAGS} -D_FILE_OFFSET_BITS=64"
local -x LDFLAGS=${BUILD_LDFLAGS}
fi
echo "$@" >&2
@@ -61,7 +60,7 @@ src_compile() {
# configure.py appends CFLAGS to CXXFLAGS
unset CFLAGS
- append-lfs-flags
+ local -x CXXFLAGS="${CXXFLAGS} -D_FILE_OFFSET_BITS=64"
run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
diff --git a/dev-build/ninja/ninja-9999.ebuild b/dev-build/ninja/ninja-9999.ebuild
index eae54565f9fc..9442eeaecf97 100644
--- a/dev-build/ninja/ninja-9999.ebuild
+++ b/dev-build/ninja/ninja-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit edo bash-completion-r1 flag-o-matic python-any-r1 toolchain-funcs
+inherit edo bash-completion-r1 python-any-r1 toolchain-funcs
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
@@ -40,7 +40,6 @@ PDEPEND="
PATCHES=(
"${FILESDIR}"/ninja-cflags.patch
- "${FILESDIR}"/ninja-cppflags.patch
)
run_for_build() {
@@ -48,7 +47,7 @@ run_for_build() {
local -x AR=$(tc-getBUILD_AR)
local -x CXX=$(tc-getBUILD_CXX)
local -x CFLAGS=
- local -x CXXFLAGS=${BUILD_CXXFLAGS}
+ local -x CXXFLAGS="${BUILD_CXXFLAGS} -D_FILE_OFFSET_BITS=64"
local -x LDFLAGS=${BUILD_LDFLAGS}
fi
echo "$@" >&2
@@ -61,7 +60,7 @@ src_compile() {
# configure.py appends CFLAGS to CXXFLAGS
unset CFLAGS
- append-lfs-flags
+ local -x CXXFLAGS="${CXXFLAGS} -D_FILE_OFFSET_BITS=64"
run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-02-21 21:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-21 21:00 [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/files/, dev-build/ninja/ Mike Gilbert
-- strict thread matches above, loose matches on Subject: below --
2024-02-05 23:16 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox