summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2024-02-21 15:56:03 -0500
committerMike Gilbert <floppym@gentoo.org>2024-02-21 15:59:44 -0500
commit9549bcf6aceef0dcc7cbe779d30d7733dbe8f0f2 (patch)
treea30fe9292e0a9993b0d5356659161bb162028979 /dev-build/ninja/ninja-1.11.1-r5.ebuild
parentdev-build/ninja: drop 1.11.1-r2, 1.11.1-r3, 1.11.1-r4 (diff)
downloadgentoo-9549bcf6aceef0dcc7cbe779d30d7733dbe8f0f2.tar.gz
gentoo-9549bcf6aceef0dcc7cbe779d30d7733dbe8f0f2.tar.bz2
gentoo-9549bcf6aceef0dcc7cbe779d30d7733dbe8f0f2.zip
dev-build/ninja: simplify LFS handling
Just append -D_FILE_OFFSET_BITS=64 to CXXFLAGS directly. Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'dev-build/ninja/ninja-1.11.1-r5.ebuild')
-rw-r--r--dev-build/ninja/ninja-1.11.1-r5.ebuild7
1 files changed, 3 insertions, 4 deletions
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