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
